cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-03-12 16:23:45 -04:00
parent b3f231c750
commit 1196bffdb5
Failed to extract signature
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -47,11 +47,16 @@ scrollBox = propertyList "scroll server" $ props
, "rm -f \"$t\"" , "rm -f \"$t\""
, "mkdir \"$t\"" , "mkdir \"$t\""
, "cd \"$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" , "SHELL=/bin/sh script --timing=timing -c ../../scroll/scroll"
, "echo Thanks for playing scroll!" , "echo Thanks for playing scroll! https://joeyh.name/code/scroll/"
, "echo Your game was recorded, as ID:$(basename \"$t\"), if you would like to talk about how it went." , "echo Your game was recorded, as ID:$(basename \"$t\")"
, "echo scroll@joeyh.name / http://joeyh.name/code/scroll/" , "echo if you would like to talk about how it went, email scroll@joeyh.name"
, "read me" , "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))) ] `onChange` (s `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
-- prevent port forwarding etc by not letting scroll log in via ssh -- prevent port forwarding etc by not letting scroll log in via ssh
& Ssh.sshdConfig `File.containsLine` ("DenyUsers scroll") & Ssh.sshdConfig `File.containsLine` ("DenyUsers scroll")
@ -71,6 +76,7 @@ scrollBox = propertyList "scroll server" $ props
where where
d = "/home/scroll" d = "/home/scroll"
s = d </> "login.sh" s = d </> "login.sh"
g = d </> "game.sh"
oldUseNetServer :: [Host] -> Property HasInfo oldUseNetServer :: [Host] -> Property HasInfo
oldUseNetServer hosts = propertyList "olduse.net server" $ props oldUseNetServer hosts = propertyList "olduse.net server" $ props