From 381ac4890cfced84edb9e115e1e53387f6fb8392 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Jul 2019 11:20:48 -0400 Subject: update from Stable "stretch" to Stable "buster" in some examples --- config-freebsd.hs | 2 +- src/Propellor/Info.hs | 4 ++-- src/Propellor/Property/Sbuild.hs | 2 +- src/Propellor/Types/OS.hs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config-freebsd.hs b/config-freebsd.hs index 34880113..00048245 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 "stretch") X86_64 + & osDebian' KFreeBSD (Stable "buster") 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 01a53ad5..f3627174 100644 --- a/src/Propellor/Info.hs +++ b/src/Propellor/Info.hs @@ -91,13 +91,13 @@ hasContainerCapability c = elem c -- It also lets the type checker know that all the properties of the -- host must support Debian. -- --- > & osDebian (Stable "stretch") X86_64 +-- > & osDebian (Stable "buster") X86_64 osDebian :: DebianSuite -> Architecture -> Property (HasInfo + Debian) osDebian = osDebian' Linux -- Use to specify a different `DebianKernel` than the default `Linux` -- --- > & osDebian' KFreeBSD (Stable "stretch") X86_64 +-- > & osDebian' KFreeBSD (Stable "buster") 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/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 26e7ae8e..1562f80e 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -21,7 +21,7 @@ stretch, which older sbuild can't handle. Suggested usage in @config.hs@: > mybox = host "mybox.example.com" $ props -> & osDebian (Stable "stretch") X86_64 +> & osDebian (Stable "buster") X86_64 > & Apt.useLocalCacher > & sidSchrootBuilt > & Sbuild.usableBy (User "spwhitton") diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs index 34ea4272..7c87b555 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 "stretch". +-- such as Stable "buster". data DebianSuite = Experimental | Unstable | Testing | Stable Release deriving (Show, Eq) -- cgit v1.2.3