From 62805fb0f5f0c206d1637621ce31536d2d7c46ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 20:29:39 -0400 Subject: [PATCH 01/21] need openssl for shellinabox with ssl --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1e0268b..c905b46 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" From 8a8614dd9da6a8b45859b724569536954f99cd1b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 21:39:19 -0400 Subject: [PATCH 02/21] propellor spin From 854061d50d42871b997d5b3aacabc5d48a9e24ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 21:42:22 -0400 Subject: [PATCH 03/21] propellor spin From 357700b99e3a74c43913ca4b196ba5ae4c3e77b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 21:43:37 -0400 Subject: [PATCH 04/21] propellor spin From 0c5693cd4ac17a6461e77065ba836d7a13f01360 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 21:49:24 -0400 Subject: [PATCH 05/21] propellor spin From d3f49c55ec97d61834c258491b864212b2e7a0e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 21:54:13 -0400 Subject: [PATCH 06/21] propellor spin From beb49d2c2bee77dc67f68329a2e99c6c4b4ccc43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:05:17 -0400 Subject: [PATCH 07/21] propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c905b46..1ed9e5d 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/" From 937ad0bb61921b755e6a2f0b1d0adf911b785834 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:48:29 -0400 Subject: [PATCH 08/21] propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1ed9e5d..5c8289e 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" From 16f291386a9d0c3305797f6ea782ae246d49dc4f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:52:16 -0400 Subject: [PATCH 09/21] propellor spin From 481a66ed7118bb69252703d494dfba3d14e6db50 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:55:12 -0400 Subject: [PATCH 10/21] propellor spin From 55fe254d1ab527ab4769f5602d4f66bf139302e5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 23:06:53 -0400 Subject: [PATCH 11/21] propellor spin From 35dc001873f3c337bd7a61e8538ac12650ccce66 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 23:37:36 -0400 Subject: [PATCH 12/21] propellor spin From 4139a8ba90ea9d50277cac8bcddd4abcc3e25756 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 23:43:59 -0400 Subject: [PATCH 13/21] propellor spin From 46e8b5ba43e0af0149efb15c853c0c5c4f3d092c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 13:10:01 -0400 Subject: [PATCH 14/21] propellor spin From a90211d7b8beb6a6cbd04142a565008a8119a819 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 13:14:49 -0400 Subject: [PATCH 15/21] propellor spin From 15e4a92d34fd40b1185d84764d2fb745163b6b72 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 14:32:00 -0400 Subject: [PATCH 16/21] propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 5c8289e..dc683af 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" From 61a53a2bac7e11d1c2f0544f5b911a00f5e641ab Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 14:50:13 -0400 Subject: [PATCH 17/21] propellor spin From f5cbda9b3e7847cec59d94e60215e56c2165fbe7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 16:50:44 -0400 Subject: [PATCH 18/21] propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index dc683af..5f0472c 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" From ad1e58b85d5ffb4ae0807ebf5a20db1a97a7dab4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 18:23:45 -0400 Subject: [PATCH 19/21] propellor spin From e5d0443f6fecec67866c5e2441781922b5d57061 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Mar 2015 18:26:30 -0400 Subject: [PATCH 20/21] propellor spin From b31ad1d2ce484246b12d037817b51fea9d59ec16 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 14 Mar 2015 15:59:59 -0400 Subject: [PATCH 21/21] remove announcedir target --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/rules b/debian/rules index c553132..c88cc00 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,3 @@ override_dh_installdocs: dh_installdocs doc/README.mdwn override_dh_installman: dh_installman propellor.1 - -# Not intended for use by anyone except the author. -announcedir: - @echo ${HOME}/src/propellor/doc/news