diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-11 22:47:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-11 22:47:39 -0400 |
| commit | c8ea87877e0e3085c1ad5425b7c5a745bd29fe51 (patch) | |
| tree | 3b6a69a4c85e4932d3dd5bc680fda8f138136088 /src | |
| parent | 3a58ec6a865aec42bcb3f230dc7cc780805bae41 (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 161fbb82..c620a0eb 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -23,7 +23,7 @@ import System.Posix.Files import Data.String.Utils scrollBox :: Property HasInfo -scrollBox = propertyList "scroll shell box" $ props +scrollBox = propertyList "scroll server" $ props & alias "scroll.joeyh.name" & User.accountFor "scroll" & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing @@ -48,7 +48,7 @@ scrollBox = propertyList "scroll shell box" $ props , "rm -f \"$t\"" , "mkdir \"$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 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/" @@ -59,6 +59,15 @@ scrollBox = propertyList "scroll shell box" $ props & cmdProperty "chsh" ["scroll", "-s", s] & User.hasPassword "scroll" & 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 d = "/home/scroll" s = d </> "login.sh" |