From 62805fb0f5f0c206d1637621ce31536d2d7c46ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 20:29:39 -0400 Subject: need openssl for shellinabox with ssl --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1e0268b0..c905b462 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -406,7 +406,7 @@ ircBouncer = propertyList "IRC bouncer" $ props kiteShellBox :: Property NoInfo kiteShellBox = propertyList "kitenet.net shellinabox" - [ Apt.installed ["shellinabox"] + [ Apt.installed ["openssl", "shellinabox"] , File.hasContent "/etc/default/shellinabox" [ "# Deployed by propellor" , "SHELLINABOX_DAEMON_START=1" -- cgit v1.2.3 From beb49d2c2bee77dc67f68329a2e99c6c4b4ccc43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:05:17 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c905b462..1ed9e5db 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -49,13 +49,16 @@ scrollBox = propertyList "scroll server" $ props , "mkdir \"$t\"" , "cd \"$t\"" , "echo" + , "echo Note that games on this server are time-limited to 2 hours" + , "echo 'Need more time? Run scroll locally instead!'" + , "echo" , "echo Press Enter to start the game." , "read me" , "SHELL=/bin/sh script --timing=timing -c " ++ g ] `onChange` (s `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes))) & g `File.hasContent` [ "#!/bin/sh" - , "if ! ../../scroll/scroll; then" + , "if ! timeout --kill-after 1m --foreground 2h ../../scroll/scroll; then" , "echo Scroll seems to have ended unexpectedly. Possibly a bug.." , "else" , "echo Thanks for playing scroll! https://joeyh.name/code/scroll/" -- cgit v1.2.3 From 937ad0bb61921b755e6a2f0b1d0adf911b785834 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:48:29 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1ed9e5db..5c8289e7 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -30,7 +30,7 @@ scrollBox = propertyList "scroll server" $ props "libghc-bytestring-dev", "libghc-mtl-dev", "libghc-ncurses-dev", "libghc-random-dev", "libghc-monad-loops-dev", "libghc-ifelse-dev", "libghc-case-insensitive-dev", - "libghc-data-default-dev"] + "libghc-data-default-dev", "libghc-optparse-applicative-dev"] & userScriptProperty "scroll" [ "cd " ++ d "scroll" , "git pull" -- cgit v1.2.3 From 15e4a92d34fd40b1185d84764d2fb745163b6b72 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 14:32:00 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 5c8289e7..dc683af2 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -28,7 +28,7 @@ scrollBox = propertyList "scroll server" $ props & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d "scroll") Nothing & Apt.installed ["ghc", "make", "cabal-install", "libghc-vector-dev", "libghc-bytestring-dev", "libghc-mtl-dev", "libghc-ncurses-dev", - "libghc-random-dev", "libghc-monad-loops-dev", + "libghc-random-dev", "libghc-monad-loops-dev", "libghc-text-dev", "libghc-ifelse-dev", "libghc-case-insensitive-dev", "libghc-data-default-dev", "libghc-optparse-applicative-dev"] & userScriptProperty "scroll" -- cgit v1.2.3 From f5cbda9b3e7847cec59d94e60215e56c2165fbe7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 16:50:44 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index dc683af2..5f0472ca 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -30,6 +30,7 @@ scrollBox = propertyList "scroll server" $ props "libghc-bytestring-dev", "libghc-mtl-dev", "libghc-ncurses-dev", "libghc-random-dev", "libghc-monad-loops-dev", "libghc-text-dev", "libghc-ifelse-dev", "libghc-case-insensitive-dev", + "libghc-transformers-dev", "libghc-data-default-dev", "libghc-optparse-applicative-dev"] & userScriptProperty "scroll" [ "cd " ++ d "scroll" -- cgit v1.2.3