cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-04-19 12:51:12 -04:00
parent 4020a3e707 fe6ff079e6
commit 10ed35441f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-joey.hs
View File

@ -222,7 +222,6 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.configured & Docker.configured
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
! Docker.docked oldusenetShellBox
& alias "nntp.olduse.net" & alias "nntp.olduse.net"
& JoeySites.oldUseNetServer hosts & JoeySites.oldUseNetServer hosts

4
config-simple.hs
View File

@ -41,8 +41,8 @@ hosts =
-- A generic webserver in a Docker container. -- A generic webserver in a Docker container.
webserverContainer :: Docker.Container webserverContainer :: Docker.Container
webserverContainer = Docker.container "webserver" "joeyh/debian-stable" webserverContainer = Docker.container "webserver" "debian"
& os (System (Debian (Stable "wheezy")) "amd64") & os (System (Debian (Stable "jessie")) "amd64")
& Apt.stdSourcesList & Apt.stdSourcesList
& Docker.publish "80:80" & Docker.publish "80:80"
& Docker.volume "/var/www:/var/www" & Docker.volume "/var/www:/var/www"

2
src/Propellor/Types/OS.hs
View File

@ -25,7 +25,7 @@ data Distribution
deriving (Show, Eq) deriving (Show, Eq)
-- | Debian has several rolling suites, and a number of stable releases, -- | 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 data DebianSuite = Experimental | Unstable | Testing | Stable Release
deriving (Show, Eq) deriving (Show, Eq)