From bb1a6594475d3d2dd2f40f4363b650bd276a157e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Jun 2017 09:18:22 -0400 Subject: use stretch in debian stable examples --- config-freebsd.hs | 2 +- src/Propellor/Info.hs | 4 ++-- src/Propellor/Types/OS.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-freebsd.hs b/config-freebsd.hs index 80abb89d..34880113 100644 --- a/config-freebsd.hs +++ b/config-freebsd.hs @@ -59,7 +59,7 @@ linuxbox = host "linuxbox.example.com" $ props -- A generic webserver in a Docker container. webserverContainer :: Docker.Container webserverContainer = Docker.container "webserver" (Docker.latestImage "debian") $ props - & osDebian' KFreeBSD (Stable "jessie") X86_64 + & osDebian' KFreeBSD (Stable "stretch") X86_64 & Apt.stdSourcesList & Docker.publish "80:80" & Docker.volume "/var/www:/var/www" diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs index 49ca689f..ed6c2d85 100644 --- a/src/Propellor/Info.hs +++ b/src/Propellor/Info.hs @@ -84,13 +84,13 @@ askInfo = asks (fromInfo . hostInfo) -- It also lets the type checker know that all the properties of the -- host must support Debian. -- --- > & osDebian (Stable "jessie") X86_64 +-- > & osDebian (Stable "stretch") X86_64 osDebian :: DebianSuite -> Architecture -> Property (HasInfo + Debian) osDebian = osDebian' Linux -- Use to specify a different `DebianKernel` than the default `Linux` -- --- > & osDebian' KFreeBSD (Stable "jessie") X86_64 +-- > & osDebian' KFreeBSD (Stable "stretch") X86_64 osDebian' :: DebianKernel -> DebianSuite -> Architecture -> Property (HasInfo + Debian) osDebian' kernel suite arch = tightenTargets $ os (System (Debian kernel suite) arch) diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs index 41f839f1..01d777a4 100644 --- a/src/Propellor/Types/OS.hs +++ b/src/Propellor/Types/OS.hs @@ -59,7 +59,7 @@ data DebianKernel = Linux | KFreeBSD | Hurd deriving (Show, Eq) -- | Debian has several rolling suites, and a number of stable releases, --- such as Stable "jessie". +-- such as Stable "stretch". data DebianSuite = Experimental | Unstable | Testing | Stable Release deriving (Show, Eq) -- cgit v1.2.3