From b9a093c988d7643699cca20e0e104dc4ecc08180 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Apr 2015 09:41:40 -0400 Subject: [PATCH 1/2] jessie is almost ready to be the new debian stable, update a few examples no behavior changes --- config-simple.hs | 4 ++-- src/Propellor/Types/OS.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config-simple.hs b/config-simple.hs index 9900d6b..aca129e 100644 --- a/config-simple.hs +++ b/config-simple.hs @@ -41,8 +41,8 @@ hosts = -- A generic webserver in a Docker container. webserverContainer :: Docker.Container -webserverContainer = Docker.container "webserver" "joeyh/debian-stable" - & os (System (Debian (Stable "wheezy")) "amd64") +webserverContainer = Docker.container "webserver" "debian" + & os (System (Debian (Stable "jessie")) "amd64") & Apt.stdSourcesList & Docker.publish "80:80" & Docker.volume "/var/www:/var/www" diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs index 8b3cd0f..2bb4144 100644 --- a/src/Propellor/Types/OS.hs +++ b/src/Propellor/Types/OS.hs @@ -25,7 +25,7 @@ data Distribution deriving (Show, Eq) -- | Debian has several rolling suites, and a number of stable releases, --- such as Stable "wheezy". +-- such as Stable "jessie". data DebianSuite = Experimental | Unstable | Testing | Stable Release deriving (Show, Eq) From fe6ff079e6770ce452ea0ba1b49b68bebeaed2d3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Apr 2015 12:28:29 -0400 Subject: [PATCH 2/2] cleanup --- config-joey.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/config-joey.hs b/config-joey.hs index dd18bd8..6a7e1c8 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -222,7 +222,6 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" & Docker.configured & Docker.garbageCollected `period` Daily - ! Docker.docked oldusenetShellBox & alias "nntp.olduse.net" & JoeySites.oldUseNetServer hosts