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/Property/SiteSpecific/JoeySites.hs') 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/Property/SiteSpecific/JoeySites.hs') 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