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

propellor spin

This commit is contained in:
Joey Hess 2015-03-11 22:47:39 -04:00
parent 3a58ec6a86
commit c8ea87877e
Failed to extract signature
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import System.Posix.Files
import Data.String.Utils import Data.String.Utils
scrollBox :: Property HasInfo scrollBox :: Property HasInfo
scrollBox = propertyList "scroll shell box" $ props scrollBox = propertyList "scroll server" $ props
& alias "scroll.joeyh.name" & alias "scroll.joeyh.name"
& User.accountFor "scroll" & User.accountFor "scroll"
& Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing
@ -48,7 +48,7 @@ scrollBox = propertyList "scroll shell box" $ props
, "rm -f \"$t\"" , "rm -f \"$t\""
, "mkdir \"$t\"" , "mkdir \"$t\""
, "cd \"$t\"" , "cd \"$t\""
, "timeout 1d script --timing=timing -c ../../scroll/scroll" , "SHELL=/bin/sh timeout 1d script --timing=timing -c ../../scroll/scroll"
, "echo Thanks for playing 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 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/" , "echo scroll@joeyh.name / http://joeyh.name/code/scroll/"
@ -59,6 +59,15 @@ scrollBox = propertyList "scroll shell box" $ props
& cmdProperty "chsh" ["scroll", "-s", s] & cmdProperty "chsh" ["scroll", "-s", s]
& User.hasPassword "scroll" & User.hasPassword "scroll"
& Apt.serviceInstalledRunning "telnetd" & Apt.serviceInstalledRunning "telnetd"
& Apt.installed ["shellinabox"]
& File.hasContent "/etc/default/shellinabox"
[ "# Deployed by propellor"
, "SHELLINABOX_DAEMON_START=1"
, "SHELLINABOX_PORT=4242"
, "SHELLINABOX_ARGS=\"--no-beep --service=/:TELNET:localhost\""
]
`onChange` Service.restarted "shellinabox"
& Service.running "shellinabox"
where where
d = "/home/scroll" d = "/home/scroll"
s = d </> "login.sh" s = d </> "login.sh"