From 0e0a70f794c8659a1687278a69f6ee87eebf4798 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Apr 2014 22:09:29 -0400 Subject: propellor spin --- config-joey.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 6039a529..b45cdba8 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -19,6 +19,7 @@ import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Git as Git import qualified Propellor.Property.Apache as Apache import qualified Propellor.Property.Postfix as Postfix +import qualified Propellor.Property.Obnam as Obnam import qualified Propellor.Property.SiteSpecific.GitHome as GitHome import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites @@ -171,7 +172,10 @@ gitAnnexBuilder arch buildminute = Docker.container (arch ++ "-git-annex-builder standardSystem :: HostName -> DebianSuite -> Architecture -> Host standardSystem hn suite arch = host hn & os (System (Debian suite) arch) - & Apt.stdSourcesList suite `onChange` Apt.upgrade + & Apt.trustsKey Obnam.aptKey + & Apt.stdSourcesList' suite + [ Obnam.aptSources ] + `onChange` Apt.upgrade & Apt.installed ["etckeeper"] & Apt.installed ["ssh"] & GitHome.installedFor "root" -- cgit v1.3-2-g0d8e