From 09435e9bcc09adf6c85d5821602a7adb6dde3a04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Mar 2015 22:06:08 -0400 Subject: propellor spin --- config-joey.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index f9f4eaa7..b8bfcf70 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -96,6 +96,7 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" & "/var/www/index.html" `File.hasContent` ["hello, world"] & alias "helloworld.kitenet.net" & Docker.docked oldusenetShellBox + & JoeySites.scrollBox -- ssh on some extra ports to deal with horrible networks -- while travelling -- cgit v1.3-2-g0d8e From b3f231c750e571795787e0f11f90a3d68720e6eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 16:12:36 -0400 Subject: propellor spin --- config-joey.hs | 7 +++++++ src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index b8bfcf70..77e93f26 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -96,7 +96,10 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" & "/var/www/index.html" `File.hasContent` ["hello, world"] & alias "helloworld.kitenet.net" & Docker.docked oldusenetShellBox + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "us.scroll.joeyh.name" -- ssh on some extra ports to deal with horrible networks -- while travelling @@ -273,6 +276,10 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" & Docker.docked jerryPlay & Docker.garbageCollected `period` (Weekly (Just 1)) + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "eu.scroll.joeyh.name" + -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1b03798a..e9bf6f52 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -24,7 +24,6 @@ import Data.String.Utils scrollBox :: Property HasInfo scrollBox = propertyList "scroll server" $ props - & alias "scroll.joeyh.name" & User.accountFor "scroll" & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d "scroll") Nothing & Apt.installed ["ghc", "make", "cabal-install", "libghc-vector-dev", -- cgit v1.3-2-g0d8e From fe10f73c0fd9dfffcbf94711f888f1ab8b7d6359 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:45:55 -0400 Subject: propellor spin --- config-joey.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 77e93f26..ce0ebba2 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -274,6 +274,7 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" `requires` Apt.serviceInstalledRunning "ntp" & Docker.docked ancientKitenet & Docker.docked jerryPlay + & Docker.docked kiteShellBox & Docker.garbageCollected `period` (Weekly (Just 1)) & JoeySites.scrollBox @@ -283,7 +284,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" - & JoeySites.kiteShellBox -- Nothing is using http port 80, so listen on -- that port for ssh, for traveling on bad networks that -- block 22. @@ -356,6 +356,10 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" & Apt.installed ["ssh"] & User.hasSomePassword "root" & Ssh.permitRootLogin True + +kiteShellBox :: Docker.Container +kiteShellBox = standardContainer "kiteshell" (Stable "wheezy") "amd64" + & JoeySites.kiteShellBox type Motd = [String] -- cgit v1.3-2-g0d8e From c2a8163876b16ba9bbbaf5b59a91ca2b79462ef3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:46:08 -0400 Subject: propellor spin --- config-joey.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index ce0ebba2..57f7a835 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -358,7 +358,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" & Ssh.permitRootLogin True kiteShellBox :: Docker.Container -kiteShellBox = standardContainer "kiteshell" (Stable "wheezy") "amd64" +kiteShellBox = standardContainer "kiteshellbox" (Stable "wheezy") "amd64" & JoeySites.kiteShellBox type Motd = [String] -- cgit v1.3-2-g0d8e From 363ee6ef59efac0f43ff27b4cb9e46126eb44270 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:49:18 -0400 Subject: propellor spin --- config-joey.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 57f7a835..c852826e 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -358,7 +358,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" & Ssh.permitRootLogin True kiteShellBox :: Docker.Container -kiteShellBox = standardContainer "kiteshellbox" (Stable "wheezy") "amd64" +kiteShellBox = standardStableContainer "kiteshellbox" & JoeySites.kiteShellBox type Motd = [String] -- cgit v1.3-2-g0d8e From 370aad7825f15ed661419875d43320dc1c8f719d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:53:40 -0400 Subject: propellor spin --- config-joey.hs | 1 + debian/changelog | 1 + src/Propellor/Shim.hs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index c852826e..723686d6 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -360,6 +360,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" kiteShellBox :: Docker.Container kiteShellBox = standardStableContainer "kiteshellbox" & JoeySites.kiteShellBox + & Docker.publish "4242:4242" type Motd = [String] diff --git a/debian/changelog b/debian/changelog index 363109ba..7619a1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ propellor (2.2.1) UNRELEASED; urgency=medium * userScriptProperty now passes --shell /bin/sh, so it can be used even for users with nonstandard shells. + * Fix bug in docker propellor shim setup introduced in last release. -- Joey Hess Wed, 11 Mar 2015 22:29:23 -0400 diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs index e1ea2825..5fc1ea05 100644 --- a/src/Propellor/Shim.hs +++ b/src/Propellor/Shim.hs @@ -34,7 +34,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do fromMaybe (error "cannot find ld-linux linker") $ headMaybe $ filter ("ld-linux" `isInfixOf`) libs' let linkersym = takeDirectory linker takeFileName propellorbin - createSymbolicLink linkersym (takeFileName linker) + createSymbolicLink (takeFileName linker) linkersym let gconvdir = (dest ++) $ takeDirectory $ fromMaybe (error "cannot find gconv directory") $ -- cgit v1.3-2-g0d8e From cc1f2ff611cb171228eddbedf0c89b78db346244 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 19:57:09 -0400 Subject: propellor spin --- config-joey.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 723686d6..d51b7c91 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -274,7 +274,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" `requires` Apt.serviceInstalledRunning "ntp" & Docker.docked ancientKitenet & Docker.docked jerryPlay - & Docker.docked kiteShellBox & Docker.garbageCollected `period` (Weekly (Just 1)) & JoeySites.scrollBox @@ -284,6 +283,7 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" + & Docker.docked kiteShellBox -- Nothing is using http port 80, so listen on -- that port for ssh, for traveling on bad networks that -- block 22. @@ -360,7 +360,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64" kiteShellBox :: Docker.Container kiteShellBox = standardStableContainer "kiteshellbox" & JoeySites.kiteShellBox - & Docker.publish "4242:4242" + & Docker.publish "443:443" type Motd = [String] -- cgit v1.3-2-g0d8e