summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-03-12 16:23:45 -0400
committerJoey Hess2015-03-12 16:23:45 -0400
commit1196bffdb5be4031cac1c0e9858d4f97daa40fe9 (patch)
tree4fea5b2bb424e4ce17761222dc7a56dc4d0a635c /src
parentb3f231c750e571795787e0f11f90a3d68720e6eb (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e9bf6f52..7c6fd0e6 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -47,11 +47,16 @@ scrollBox = propertyList "scroll server" $ props
, "rm -f \"$t\""
, "mkdir \"$t\""
, "cd \"$t\""
+ , "SHELL=/bin/sh script --timing=timing -c " ++ g
+ ] `onChange` (s `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
+ & g `File.hasContent`
+ [ "#!/bin/sh"
, "SHELL=/bin/sh script --timing=timing -c ../../scroll/scroll"
- , "echo Thanks for playing scroll!"
- , "echo Your game was recorded, as ID:$(basename \"$t\"), if you would like to talk about how it went."
- , "echo scroll@joeyh.name / http://joeyh.name/code/scroll/"
- , "read me"
+ , "echo Thanks for playing scroll! https://joeyh.name/code/scroll/"
+ , "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)"
+ , "mail joey@kitenet.net"
] `onChange` (s `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
-- prevent port forwarding etc by not letting scroll log in via ssh
& Ssh.sshdConfig `File.containsLine` ("DenyUsers scroll")
@@ -71,6 +76,7 @@ scrollBox = propertyList "scroll server" $ props
where
d = "/home/scroll"
s = d </> "login.sh"
+ g = d </> "game.sh"
oldUseNetServer :: [Host] -> Property HasInfo
oldUseNetServer hosts = propertyList "olduse.net server" $ props