summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2016-08-31 18:46:54 -0400
committerJoey Hess2016-08-31 18:46:54 -0400
commit3a14e3410790be1457aff595bc4189ca2159a6f9 (patch)
treed035224e026da5e7d475ecebf8e1c4de8e4d37ce /src
parentc344dd29aa8388453b13d5ace8a1ec5b030015c9 (diff)
parent32ff11ca82b8a6369931e8fefdb6c37d58f3dd56 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
-rw-r--r--src/Propellor/Property/Ssh.hs2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index bd2636cc..a0aacd61 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -71,12 +71,8 @@ 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
& Ssh.sshdConfig `File.containsLine` ("DenyUsers scroll")
`onChange` Ssh.restarted
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 0a92e42b..bce522f6 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