summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-17 22:09:29 -0400
committerJoey Hess2014-04-17 22:09:29 -0400
commit0e0a70f794c8659a1687278a69f6ee87eebf4798 (patch)
treed662a5ec06479895171b77fd3fe76c2d96e8dbae /config-joey.hs
parent0485387aa03f2e81c218fe689cb6a9a5a8fe14a4 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs6
1 files changed, 5 insertions, 1 deletions
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"