Merge branch 'joeyconfig'

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

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"

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)