From d51647d69d0de9663e61e4ca343ef4f4d1791f34 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 02:27:32 -0400 Subject: propellor spin --- config-joey.hs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index ae575ea7..eca421db 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -162,6 +162,9 @@ hosts = -- (o) ` & Dns.secondaryFor ["animx"] hosts "animx.eu.org" + -- storage and backup server + , standardSystem "elephant.kitenet.net" Unstable "amd64" + & ipv4 "193.234.225.114" --' __|II| ,. ---- __|II|II|__ ( \_,/\ -- cgit v1.2.3 From 442dbe23119e585e2d38456a87e46b265ba3acb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 02:53:42 -0400 Subject: propellor spin --- config-joey.hs | 2 ++ src/Propellor/Property/Apt.hs | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index eca421db..026f2095 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -221,6 +221,7 @@ standardSystem hn suite arch = host hn & os (System (Debian suite) arch) & Apt.stdSourcesList suite `onChange` Apt.upgrade + & Apt.cacheCleaned & Apt.installed ["etckeeper"] & Apt.installed ["ssh"] & GitHome.installedFor "root" @@ -245,6 +246,7 @@ standardContainer name suite arch = Docker.container name (dockerImage system) & os (System (Debian suite) arch) & Apt.stdSourcesList suite & Apt.unattendedUpgrades + & Apt.cacheCleaned where system = System (Debian suite) arch diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index d3f47a80..69144d72 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -254,3 +254,9 @@ trustsKey k = RevertableProperty trust untrust hPutStr h (pubkey k) hClose h nukeFile $ f ++ "~" -- gpg dropping + +-- | Cleans apt's cache of downloaded packages to avoid using up disk +-- space. +cacheCleaned :: Property +cacheCleaned = cmdProperty "apt-get" ["clean"] + `describe` "apt cache cleaned" -- cgit v1.2.3 From 956bcda940f0d569e88b49c48e6af49e10e9bc8b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 05:05:51 -0400 Subject: propellor spin --- config-joey.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 026f2095..2a4f262a 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -166,6 +166,8 @@ hosts = -- (o) ` , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" + & Docker.garbageCollected `period` Daily + --' __|II| ,. ---- __|II|II|__ ( \_,/\ ------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'- -- cgit v1.2.3 From eae58f33397de9850d76c06df6ab37c1a906a200 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 05:58:13 -0400 Subject: propellor spin --- config-joey.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 2a4f262a..92fef2ba 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -163,7 +163,9 @@ hosts = -- (o) ` & Dns.secondaryFor ["animx"] hosts "animx.eu.org" -- storage and backup server - , standardSystem "elephant.kitenet.net" Unstable "amd64" + -- Running stable because unstable kernels don't boot for unknown + -- reason. + , standardSystem "elephant.kitenet.net" Stable "amd64" & ipv4 "193.234.225.114" & Docker.garbageCollected `period` Daily -- cgit v1.2.3 From 3dea85a63ee4e57b519004f479ddd8ee726dbced Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 06:44:14 -0400 Subject: propellor spin --- config-joey.hs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 92fef2ba..1b1c7396 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -163,13 +163,11 @@ hosts = -- (o) ` & Dns.secondaryFor ["animx"] hosts "animx.eu.org" -- storage and backup server - -- Running stable because unstable kernels don't boot for unknown - -- reason. - , standardSystem "elephant.kitenet.net" Stable "amd64" + -- (Unstable, but running stable kernel, because unstable kernels + -- don't boot for unknown reason.) + , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" - & Docker.garbageCollected `period` Daily - --' __|II| ,. ---- __|II|II|__ ( \_,/\ ------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'- -- cgit v1.2.3 From 54c4c9da79deb2380117c952e9a665c4b1fa6fea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 07:14:49 -0400 Subject: propellor spin --- config-joey.hs | 2 -- 1 file changed, 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 1b1c7396..026f2095 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -163,8 +163,6 @@ hosts = -- (o) ` & Dns.secondaryFor ["animx"] hosts "animx.eu.org" -- storage and backup server - -- (Unstable, but running stable kernel, because unstable kernels - -- don't boot for unknown reason.) , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" -- cgit v1.2.3 From 4138340c0af80a034eeda8f07e24e6e185a95234 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 07:46:38 -0400 Subject: propellor spin --- config-joey.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 026f2095..d1d8b8b7 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -166,6 +166,10 @@ hosts = -- (o) ` , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" + -- Joey gets pocasts here. + & Apt.installed ["git-annex"] + & alias "podcatcher.kitenet.net" + --' __|II| ,. ---- __|II|II|__ ( \_,/\ ------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'- -- cgit v1.2.3 From 3af9aa3415a65a1e2d11049ebc624d4322336c41 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 07:47:40 -0400 Subject: propellor spin --- config-joey.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index d1d8b8b7..565af278 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -165,6 +165,7 @@ hosts = -- (o) ` -- storage and backup server , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" + & Hostname.sane -- Joey gets pocasts here. & Apt.installed ["git-annex"] -- cgit v1.2.3 From b50aae8b5669cfdbd4308db7706eaf8cea1a6c49 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 08:06:34 -0400 Subject: propellor spin --- config-joey.hs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 565af278..55ce4765 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -166,11 +166,18 @@ hosts = -- (o) ` , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" & Hostname.sane + & Postfix.satellite -- Joey gets pocasts here. & Apt.installed ["git-annex"] & alias "podcatcher.kitenet.net" + -- Joey runs github-backup here. + & Apt.installed ["github-backup", "moreutils"] + & let f = "/home/joey/.github-keys" + in File.hasPrivContent f + `onChange` File.ownerGroup f "joey" "joey" + --' __|II| ,. ---- __|II|II|__ ( \_,/\ ------'\o/-'-.-'-.-'-.- __|II|II|II|II|___/ __/ -'-.-'-.-'-.-'-.-'- -- cgit v1.2.3 From e32408f4e874708d560524b6fb7af74a4096b821 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 13:07:31 -0400 Subject: propellor spin --- config-joey.hs | 19 +++++++++++++------ src/Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 55ce4765..587cbeef 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -171,12 +171,10 @@ hosts = -- (o) ` -- Joey gets pocasts here. & Apt.installed ["git-annex"] & alias "podcatcher.kitenet.net" - - -- Joey runs github-backup here. - & Apt.installed ["github-backup", "moreutils"] - & let f = "/home/joey/.github-keys" - in File.hasPrivContent f - `onChange` File.ownerGroup f "joey" "joey" + + & JoeySites.githubBackup + + & Docker.docked hosts "volatagex" --' __|II| ,. ---- __|II|II|__ ( \_,/\ @@ -225,6 +223,15 @@ hosts = -- (o) ` , let gitannexdir = GitAnnexBuilder.homedir "git-annex" in GitAnnexBuilder.androidContainer dockerImage "android-git-annex" doNothing gitannexdir & Docker.volume ("/home/joey/src/git-annex:" ++ gitannexdir) + + -- temp for an aqquantance + , standardContainer "voltagex" Stable "amd64" + & Docker.publish "22022:22" + & Apt.serviceInstalledRunning "ssh" + & Ssh.permitRootLogin True + & Ssh.passwordAuthentication True + & User.hasSomePassword "root" + ] ++ monsters -- This is my standard system setup. diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f6e1e37f..b44401ea 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -330,3 +330,11 @@ kiteShellBox = propertyList "kitenet.net shellinabox" `onChange` Service.restarted "shellinabox" , Service.running "shellinabox" ] + +githubBackup :: Property +githubBackup = propertyList "github-backup box" + [ Apt.installed ["github-backup", "moreutils"] + , let f = "/home/joey/.github-keys" + in File.hasPrivContent f + `onChange` File.ownerGroup f "joey" "joey" + ] -- cgit v1.2.3 From 9ccc0ea5cdbb530cc3d532bbe23301c05c674661 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 13:09:01 -0400 Subject: propellor spin --- config-joey.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 587cbeef..9f5005b3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -174,7 +174,7 @@ hosts = -- (o) ` & JoeySites.githubBackup - & Docker.docked hosts "volatagex" + & Docker.docked hosts "voltagex" --' __|II| ,. ---- __|II|II|__ ( \_,/\ -- cgit v1.2.3 From c224625734fb4b6ae11f6fdd897ed83fc7f7bab5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 13:35:21 -0400 Subject: propellor spin --- config-joey.hs | 2 +- src/Propellor/Property/Docker.hs | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 9f5005b3..3f0d5154 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -224,7 +224,7 @@ hosts = -- (o) ` in GitAnnexBuilder.androidContainer dockerImage "android-git-annex" doNothing gitannexdir & Docker.volume ("/home/joey/src/git-annex:" ++ gitannexdir) - -- temp for an aqquantance + -- temp for an accuantance , standardContainer "voltagex" Stable "amd64" & Docker.publish "22022:22" & Apt.serviceInstalledRunning "ssh" diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index fbf34965..adaea548 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -11,6 +11,7 @@ module Propellor.Property.Docker ( configured, container, docked, + memoryLimited, garbageCollected, Image, ContainerName, @@ -25,6 +26,7 @@ module Propellor.Property.Docker ( volumes_from, workdir, memory, + cpuShares, link, ContainerAlias, -- * Internal use @@ -170,6 +172,20 @@ garbageCollected = propertyList "docker garbage collected" gcimages = property "docker images garbage collected" $ do liftIO $ report <$> (mapM removeImage =<< listImages) +-- | Configures the kernel to respect docker memory limits. +-- +-- This assumes the system boots using grub 2. And that you don't need any +-- other GRUB_CMDLINE_LINUX_DEFAULT settings. +-- +-- Only takes effect after reboot. (Not automated.) +memoryLimited :: Property +memoryLimited = "/etc/default/grub" `File.containsLine` cfg + `describe` "docker memory limited" + `onChange` cmdProperty "update-grub" [] + where + cmdline = "cgroup_enable=memory swapaccount=1" + cfg = "GRUB_CMDLINE_LINUX_DEFAULT=\""++cmdline++"\"" + data Container = Container Image [RunParam] -- | Parameters to pass to `docker run` when creating a container. @@ -220,10 +236,17 @@ workdir :: String -> Property workdir = runProp "workdir" -- | Memory limit for container. ---Format: , where unit = b, k, m or g +-- Format: , where unit = b, k, m or g +-- +-- Note: Only takes effect when the host has the memoryLimited property +-- enabled. memory :: String -> Property memory = runProp "memory" +-- | CPU shares (relative weight). +cpuShares :: Int -> Property +cpuShares = runProp "cpu-shares" . show + -- | Link with another container on the same host. link :: ContainerName -> ContainerAlias -> Property link linkwith calias = genProp "link" $ \hn -> -- cgit v1.2.3 From 3df3fd1746c2721d6b1dc08bb1422422abf07f6f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 13:40:06 -0400 Subject: propellor spin --- config-joey.hs | 4 +++- src/Propellor/Property/Docker.hs | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 3f0d5154..6d3505ed 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -224,9 +224,11 @@ hosts = -- (o) ` in GitAnnexBuilder.androidContainer dockerImage "android-git-annex" doNothing gitannexdir & Docker.volume ("/home/joey/src/git-annex:" ++ gitannexdir) - -- temp for an accuantance + -- temp for an acquantance , standardContainer "voltagex" Stable "amd64" & Docker.publish "22022:22" + & Docker.memory "500m" + & Docker.cpuShares 1 & Apt.serviceInstalledRunning "ssh" & Ssh.permitRootLogin True & Ssh.passwordAuthentication True diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index adaea548..fa3e2344 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -244,6 +244,9 @@ memory :: String -> Property memory = runProp "memory" -- | CPU shares (relative weight). +-- +-- By default, all containers run at the same priority, but you can tell +-- the kernel to give more CPU time to a container using this property. cpuShares :: Int -> Property cpuShares = runProp "cpu-shares" . show -- cgit v1.2.3 From d65a07c701bc693b546b3abdde7a4a912712c969 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 14:37:44 -0400 Subject: propellor spin --- config-joey.hs | 6 ++++-- src/Propellor/Property/Obnam.hs | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 6d3505ed..1229d182 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -168,11 +168,13 @@ hosts = -- (o) ` & Hostname.sane & Postfix.satellite - -- Joey gets pocasts here. - & Apt.installed ["git-annex"] & alias "podcatcher.kitenet.net" + & Apt.installed ["git-annex"] & JoeySites.githubBackup + + & alias "eubackup.kitenet.net" + & Apt.installed ["obnam", "sshfs", "rsync"] & Docker.docked hosts "voltagex" diff --git a/src/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs index 32374b57..e5ef7365 100644 --- a/src/Propellor/Property/Obnam.hs +++ b/src/Propellor/Property/Obnam.hs @@ -38,8 +38,12 @@ data NumClients = OnlyClient | MultipleClients -- -- How awesome is that? backup :: FilePath -> Cron.CronTimes -> [ObnamParam] -> NumClients -> Property -backup dir crontimes params numclients = cronjob `describe` desc +backup dir crontimes params numclients = backup' dir crontimes params numclients `requires` restored dir params + +-- | Does a backup, but does not automatically restore. +backup' :: FilePath -> Cron.CronTimes -> [ObnamParam] -> NumClients -> Property +backup' dir crontimes params numclients = cronjob `describe` desc where desc = dir ++ " backed up by obnam" cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $ -- cgit v1.2.3 From e8223a5c76f512497327b868407a4c0bbe3ab8bc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 14:47:32 -0400 Subject: propellor spin --- config-joey.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 1229d182..de4ad815 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -167,16 +167,18 @@ hosts = -- (o) ` & ipv4 "193.234.225.114" & Hostname.sane & Postfix.satellite - - & alias "podcatcher.kitenet.net" - & Apt.installed ["git-annex"] - - & JoeySites.githubBackup + & Apt.unattendedUpgrades & alias "eubackup.kitenet.net" & Apt.installed ["obnam", "sshfs", "rsync"] + & JoeySites.githubBackup + + & alias "podcatcher.kitenet.net" + & Apt.installed ["git-annex"] + & Docker.configured & Docker.docked hosts "voltagex" + & Docker.garbageCollected `period` (Weekly (Just 1)) --' __|II| ,. ---- __|II|II|__ ( \_,/\ -- cgit v1.2.3 From d224463dcd45b798c532d75ed84d9b1282b83e85 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 15:07:17 -0400 Subject: comment --- config-joey.hs | 4 +++- debian/changelog | 2 +- src/Propellor/Attr.hs | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index de4ad815..2f2ffa03 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -37,8 +37,9 @@ hosts = -- (o) ` -- My laptop [ host "darkstar.kitenet.net" & ipv6 "2001:4830:1600:187::2" -- sixxs tunnel - & Docker.configured + & Apt.buildDep ["git-annex"] `period` Daily + & Docker.configured & Docker.docked hosts "android-git-annex" -- Nothing super-important lives here and mostly it's docker containers. @@ -165,6 +166,7 @@ hosts = -- (o) ` -- storage and backup server , standardSystem "elephant.kitenet.net" Unstable "amd64" & ipv4 "193.234.225.114" + & Hostname.sane & Postfix.satellite & Apt.unattendedUpgrades diff --git a/debian/changelog b/debian/changelog index 695ea3fc..0f32b4eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ propellor (0.6.0) UNRELEASED; urgency=medium * Docker containers now propigate DNS attributes out to the host they're docked in. So if a docker container sets a DNS alias, every container - it's docked in will automatically become part of a round-robin DNS, + it's docked in will automatically be added to a DNS round-robin, if propellor is used to manage DNS for the domain. * Propellor's output now includes the hostname being provisioned, or when provisioning a docker container, the container name. diff --git a/src/Propellor/Attr.hs b/src/Propellor/Attr.hs index 3ed59437..7d371d40 100644 --- a/src/Propellor/Attr.hs +++ b/src/Propellor/Attr.hs @@ -37,6 +37,11 @@ ipv6 :: String -> Property ipv6 = addDNS . Address . IPv6 -- | Indicates another name for the host in the DNS. +-- +-- When the host's ipv4/ipv6 addresses are known, the alias is set up +-- to use their address, rather than using a CNAME. This avoids various +-- problems with CNAMEs, and also means that when multiple hosts have the +-- same alias, a DNS round-robin is automatically set up. alias :: Domain -> Property alias = addDNS . CNAME . AbsDomain -- cgit v1.2.3 From d75cd6c7a373165944e73505412b674fb32786df Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jun 2014 16:19:34 -0400 Subject: remove sysvinit and systemd from my docker images sysvinit hangs on upgrade if not running --- config-joey.hs | 1 + src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 2f2ffa03..9363ff5f 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -272,6 +272,7 @@ standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Host standardContainer name suite arch = Docker.container name (dockerImage system) & os (System (Debian suite) arch) & Apt.stdSourcesList suite + & Apt.removed ["sysvinit", "systemd"] & Apt.unattendedUpgrades & Apt.cacheCleaned where diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 3dcafa35..ec1dee89 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -100,6 +100,7 @@ standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") (dockerImage $ System (Debian Unstable) arch) & Apt.stdSourcesList Unstable + & Apt.removed ["sysvinit", "systemd"] & Apt.unattendedUpgrades & buildDepsApt & autobuilder (show buildminute ++ " * * * *") timeout True @@ -116,6 +117,7 @@ androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name (dockerImage $ System (Debian Stable) "i386") & Apt.stdSourcesList Stable + & Apt.removed ["sysvinit", "systemd"] & User.accountFor builduser & File.dirExists gitbuilderdir & File.ownerGroup homedir builduser builduser @@ -141,6 +143,7 @@ armelCompanionContainer :: (System -> Docker.Image) -> Host armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" (dockerImage $ System (Debian Unstable) "amd64") & Apt.stdSourcesList Unstable + & Apt.removed ["sysvinit", "systemd"] & Apt.unattendedUpgrades -- This volume is shared with the armel builder. & Docker.volume gitbuilderdir @@ -158,6 +161,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme (dockerImage $ System (Debian Unstable) "armel") & Apt.stdSourcesList Unstable & Apt.unattendedUpgrades + & Apt.removed ["sysvinit", "systemd"] & Apt.installed ["openssh-client"] & Docker.link "armel-git-annex-builder-companion" "companion" & Docker.volumes_from "armel-git-annex-builder-companion" -- cgit v1.2.3 From 07751ff6147214afd3923c595d8063c0240e587c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jun 2014 16:20:06 -0400 Subject: undock voltagex --- config-joey.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 9363ff5f..03e1f272 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -179,7 +179,7 @@ hosts = -- (o) ` & Apt.installed ["git-annex"] & Docker.configured - & Docker.docked hosts "voltagex" + ! Docker.docked hosts "voltagex" & Docker.garbageCollected `period` (Weekly (Just 1)) --' __|II| ,. -- cgit v1.2.3 From 1cf1e21532e72a6f53cad576d7e97058994d39db Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jun 2014 16:24:47 -0400 Subject: remove sysvinit by installing systemd --- config-joey.hs | 2 +- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 03e1f272..3b4e57d6 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -272,7 +272,7 @@ standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Host standardContainer name suite arch = Docker.container name (dockerImage system) & os (System (Debian suite) arch) & Apt.stdSourcesList suite - & Apt.removed ["sysvinit", "systemd"] + & Apt.installed ["systemd"] & Apt.unattendedUpgrades & Apt.cacheCleaned where diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index ec1dee89..2f467669 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -100,7 +100,7 @@ standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") (dockerImage $ System (Debian Unstable) arch) & Apt.stdSourcesList Unstable - & Apt.removed ["sysvinit", "systemd"] + & Apt.installed ["systemd"] & Apt.unattendedUpgrades & buildDepsApt & autobuilder (show buildminute ++ " * * * *") timeout True @@ -117,7 +117,7 @@ androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name (dockerImage $ System (Debian Stable) "i386") & Apt.stdSourcesList Stable - & Apt.removed ["sysvinit", "systemd"] + & Apt.installed ["systemd"] & User.accountFor builduser & File.dirExists gitbuilderdir & File.ownerGroup homedir builduser builduser @@ -143,7 +143,7 @@ armelCompanionContainer :: (System -> Docker.Image) -> Host armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" (dockerImage $ System (Debian Unstable) "amd64") & Apt.stdSourcesList Unstable - & Apt.removed ["sysvinit", "systemd"] + & Apt.installed ["systemd"] & Apt.unattendedUpgrades -- This volume is shared with the armel builder. & Docker.volume gitbuilderdir @@ -161,7 +161,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme (dockerImage $ System (Debian Unstable) "armel") & Apt.stdSourcesList Unstable & Apt.unattendedUpgrades - & Apt.removed ["sysvinit", "systemd"] + & Apt.installed ["systemd"] & Apt.installed ["openssh-client"] & Docker.link "armel-git-annex-builder-companion" "companion" & Docker.volumes_from "armel-git-annex-builder-companion" -- cgit v1.2.3