diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-17 22:25:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 22:25:09 -0400 |
| commit | 69eb566e0bd7d961e1227d10200b22fd1f0276eb (patch) | |
| tree | 22e9f5c9fef4575851e24582c8f17d2572288568 /config-joey.hs | |
| parent | 0e0a70f794c8659a1687278a69f6ee87eebf4798 (diff) | |
propellor spin
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index b45cdba8..dec1f1bd 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -19,7 +19,6 @@ 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 @@ -172,9 +171,7 @@ 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.trustsKey Obnam.aptKey - & Apt.stdSourcesList' suite - [ Obnam.aptSources ] + & Apt.stdSourcesList suite `onChange` Apt.upgrade & Apt.installed ["etckeeper"] & Apt.installed ["ssh"] |