diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-19 12:51:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-19 12:51:12 -0400 |
| commit | 10ed35441f7be707e55291891991eb98bbfb1263 (patch) | |
| tree | d6c8f8e5bb6aee0621d7915f57bd58301ec29a11 | |
| parent | 4020a3e7077b285d888845ac508b233624b17ed0 (diff) | |
| parent | fe6ff079e6770ce452ea0ba1b49b68bebeaed2d3 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | config-joey.hs | 1 | ||||
| -rw-r--r-- | config-simple.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Types/OS.hs | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index dd18bd8a..6a7e1c88 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 diff --git a/config-simple.hs b/config-simple.hs index 9900d6be..aca129e9 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 8b3cd0fd..2bb41446 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) |