From b1f3e9a766b1b245ced1e2963f8f8997cc9fd8eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 13:43:20 -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 50e712a0..28f33778 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -503,6 +503,8 @@ monsters = -- but do want to track their public keys etc. , host "turtle.kitenet.net" & ipv4 "67.223.19.96" & ipv6 "2001:4978:f:2d9::2" + , host "butterfly.kitenet.net" + & ipv6 "2001:4830:1600:187::2" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" , host "animx" -- cgit v1.2.3 From cc82993feedda8067897672289db3e6702975081 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 17:26:40 -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 28f33778..fc7791c3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -503,7 +503,7 @@ monsters = -- but do want to track their public keys etc. , host "turtle.kitenet.net" & ipv4 "67.223.19.96" & ipv6 "2001:4978:f:2d9::2" - , host "butterfly.kitenet.net" + , host "honeybee.kitenet.net" & ipv6 "2001:4830:1600:187::2" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" -- cgit v1.2.3 From b4fdd1f2850ea22e74085e17f488894c45dd0abf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 17:48:19 -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 fc7791c3..197e6e8f 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -310,6 +310,7 @@ beaver = host "beaver.kitenet.net" -- Branchable is not completely deployed with propellor yet. pell :: Host pell = host "pell.branchable.com" + & alias "branchable.com" & ipv4 "66.228.46.55" & ipv6 "2600:3c03::f03c:91ff:fedf:c0e5" -- cgit v1.2.3 From a9086c0eea725c8d093a06d0a5dab53b4bcf099a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 18:02:49 -0400 Subject: propellor spin --- config-joey.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 197e6e8f..4978c8af 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -45,6 +45,7 @@ hosts = -- (o) ` , gnu , clam , orca + , honeybee , kite , elephant , beaver @@ -133,6 +134,13 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64" & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "i386" 15 "2h") & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer (Cron.Times "1 1 * * *") "3h") +honeybee :: Host +honeybee = standardSystem "honeybee.kitenet.net" Unstable "armhf" + [ "Arm git-annex build box." ] + & ipv6 "2001:4830:1600:187::2" + + & Postfix.satellite + -- This is not a complete description of kite, since it's a -- multiuser system with eg, user passwords that are not deployed -- with propellor. @@ -504,8 +512,6 @@ monsters = -- but do want to track their public keys etc. , host "turtle.kitenet.net" & ipv4 "67.223.19.96" & ipv6 "2001:4978:f:2d9::2" - , host "honeybee.kitenet.net" - & ipv6 "2001:4830:1600:187::2" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" , host "animx" -- cgit v1.2.3 From 78fecfcba47901c6c3ff5087cc091d802c5c99d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 19:18:35 -0400 Subject: propellor spin --- config-joey.hs | 24 ++++++++++++++++++---- .../Property/SiteSpecific/GitAnnexBuilder.hs | 20 +++++++++--------- 2 files changed, 30 insertions(+), 14 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 4978c8af..92a6c318 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -129,17 +129,33 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64" & Apt.unattendedUpgrades & Postfix.satellite + & Apt.serviceInstalledRunning "ntp" & Systemd.persistentJournal - & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "amd64" 15 "2h") - & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "i386" 15 "2h") - & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer (Cron.Times "1 1 * * *") "3h") + + & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer + (System (Debian Testing) "amd64") fifteenpast "2h") + & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer + (System (Debian Testing) "i386") fifteenpast "2h") + & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer + (Cron.Times "1 1 * * *") "3h") + where + fifteenpast = Cron.Times "15 * * * *" honeybee :: Host -honeybee = standardSystem "honeybee.kitenet.net" Unstable "armhf" +honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf" [ "Arm git-annex build box." ] & ipv6 "2001:4830:1600:187::2" + -- No unattended upgrades as there is currently no console access. + -- (Also, system is not currently running a stock kernel, + -- although it should be able to.) & Postfix.satellite + & Apt.serviceInstalledRunning "ntp" + & Apt.serviceInstalledRunning "aiccu" + + -- Using unstable to get new enough ghc for TH on arm. + & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer + (System (Debian Unstable) "armel") (Cron.Daily) "22h") -- This is not a complete description of kite, since it's a -- multiuser system with eg, user passwords that are not deployed diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 86bf104c..6b73bee9 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -94,19 +94,19 @@ cabalDeps = flagFile go cabalupdated go = userScriptProperty (User builduser) ["cabal update && cabal install git-annex --only-dependencies || true"] cabalupdated = homedir ".cabal" "packages" "hackage.haskell.org" "00-index.cache" -standardAutoBuilderContainer :: Architecture -> Int -> TimeOut -> Systemd.Container -standardAutoBuilderContainer arch buildminute timeout = Systemd.container name bootstrap - & os osver - & Apt.stdSourcesList - & Apt.unattendedUpgrades - & User.accountFor (User builduser) - & tree arch - & buildDepsApt - & autobuilder arch (Cron.Times $ show buildminute ++ " * * * *") timeout +standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container +standardAutoBuilderContainer osver@(System _ arch) crontime timeout = + Systemd.container name bootstrap + & os osver + & Apt.stdSourcesList + & Apt.unattendedUpgrades + & User.accountFor (User builduser) + & tree arch + & buildDepsApt + & autobuilder arch crontime timeout where name = arch ++ "-git-annex-builder" bootstrap = Chroot.debootstrapped osver mempty - osver = System (Debian Testing) arch androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer crontimes timeout = -- cgit v1.2.3 From b5a8c7227b15bb4c821221c6f4c3ca8fd1e1a062 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 22:51:32 -0400 Subject: workaround bug --- config-joey.hs | 11 +++++++++-- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 11 ++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 92a6c318..510fd8da 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -25,6 +25,7 @@ import qualified Propellor.Property.Obnam as Obnam import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Systemd as Systemd import qualified Propellor.Property.Journald as Journald +import qualified Propellor.Property.Chroot as Chroot import qualified Propellor.Property.OS as OS import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost import qualified Propellor.Property.HostingProvider.Linode as Linode @@ -153,9 +154,15 @@ honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf" & Apt.serviceInstalledRunning "ntp" & Apt.serviceInstalledRunning "aiccu" + -- Not using systemd-nspawn because it's broken (kernel issue?) + -- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer + -- osver Cron.Daily "22h") + & Chroot.provisioned + (Chroot.debootstrapped builderos mempty "/var/lib/containers/armel-git-annex-builder" + & GitAnnexBuilder.standardAutoBuilder builderos Cron.Daily "22h") + where -- Using unstable to get new enough ghc for TH on arm. - & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer - (System (Debian Unstable) "armel") (Cron.Daily) "22h") + builderos = System (Debian Unstable) "armel" -- This is not a complete description of kite, since it's a -- multiuser system with eg, user passwords that are not deployed diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 6b73bee9..3c638721 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -97,6 +97,14 @@ cabalDeps = flagFile go cabalupdated standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container standardAutoBuilderContainer osver@(System _ arch) crontime timeout = Systemd.container name bootstrap + & standardAutoBuilder osver crontime timeout + where + name = arch ++ "-git-annex-builder" + bootstrap = Chroot.debootstrapped osver mempty + +standardAutoBuilder :: System -> Times -> TimeOut -> Property HasInfo +standardAutoBuilder osver@(System _ arch) crontime timeout = + propertyList "git-annex-builder" $ props & os osver & Apt.stdSourcesList & Apt.unattendedUpgrades @@ -104,9 +112,6 @@ standardAutoBuilderContainer osver@(System _ arch) crontime timeout = & tree arch & buildDepsApt & autobuilder arch crontime timeout - where - name = arch ++ "-git-annex-builder" - bootstrap = Chroot.debootstrapped osver mempty androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer crontimes timeout = -- cgit v1.2.3 From c67691f1aa202ae737264c68fe6f762dfe1b0481 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 May 2015 23:12:23 -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 510fd8da..73c9687b 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -158,7 +158,7 @@ honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf" -- & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer -- osver Cron.Daily "22h") & Chroot.provisioned - (Chroot.debootstrapped builderos mempty "/var/lib/containers/armel-git-annex-builder" + (Chroot.debootstrapped builderos mempty "/var/lib/container/armel-git-annex-builder" & GitAnnexBuilder.standardAutoBuilder builderos Cron.Daily "22h") where -- Using unstable to get new enough ghc for TH on arm. -- cgit v1.2.3