From ff55e5c451a3a1bf121092e27a83c686f581cbdf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Aug 2016 11:14:31 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index bd2636cc..4d9e9e47 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -71,10 +71,7 @@ scrollBox = propertyList "scroll server" $ props , "fi" , "echo Your game was recorded, as ID:$(basename \"$t\")" , "echo if you would like to talk about how it went, email scroll@joeyh.name" - , "echo 'or, type comments below (finish with a dot on its own line)'" - , "echo" - , "echo Your comments:" - , "timeout --kill-after 1m --foreground 2h mail -E -s \"scroll test $t\" joey@kitenet.net" + , "read line" ] `onChange` (g `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes))) & Apt.installed ["bsd-mailx"] -- prevent port forwarding etc by not letting scroll log in via ssh -- cgit v1.2.3 From 1ef7979cda54ecc7b30812d8a323481d69ba6602 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Aug 2016 11:41:34 -0400 Subject: unused --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 4d9e9e47..a0aacd61 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -73,7 +73,6 @@ scrollBox = propertyList "scroll server" $ props , "echo if you would like to talk about how it went, email scroll@joeyh.name" , "read line" ] `onChange` (g `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes))) - & Apt.installed ["bsd-mailx"] -- prevent port forwarding etc by not letting scroll log in via ssh & Ssh.sshdConfig `File.containsLine` ("DenyUsers scroll") `onChange` Ssh.restarted -- cgit v1.2.3 From 18a77aab556087cb744e08d3e631120c928b23d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 31 Aug 2016 17:36:08 -0400 Subject: propellor spin --- joeyconfig.hs | 3 +++ src/Propellor/Property/Ssh.hs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/joeyconfig.hs b/joeyconfig.hs index ae3e6ab1..588adfe3 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -90,6 +90,9 @@ darkstar = host "darkstar.kitenet.net" $ props & JoeySites.dkimMilter & JoeySites.alarmClock "*-*-* 7:30" (User "joey") "/usr/bin/timeout 45m /home/joey/bin/goodmorning" + & Ssh.userKeys (User "joey") hostContext + [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar") + ] ! imageBuilt "/tmp/img" c MSDOS (grubBooted PC) [ partition EXT2 `mountedAt` "/boot" diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 6e1690d2..527ad444 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -362,7 +362,7 @@ modKnownHost user f p = p -- | Ensures that a local user's authorized_keys contains lines allowing -- logins from a remote user on the specified Host. -- --- The ssh keys of the remote user can be set using `keysImported` +-- The ssh keys of the remote user can be set using `userKeys` -- -- Any other lines in the authorized_keys file are preserved as-is. authorizedKeysFrom :: User -> (User, Host) -> Property UnixLike -- cgit v1.2.3