diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-20 15:10:35 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-20 15:10:35 -0400 |
| commit | c3e489e7c3adba47211eda05bc52487caece6f32 (patch) | |
| tree | 67a1a4ca4a6def22be712e37cc27475252069093 /config-joey.hs | |
| parent | 2c84f8b38d48b36199f61ee3562a35f95a54e259 (diff) | |
| parent | 9f4b3e0ed4de04ba5fb754ea45402465faf30783 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index da755aad..65cf0d46 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -26,6 +26,7 @@ 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.Aiccu as Aiccu import qualified Propellor.Property.OS as OS import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost import qualified Propellor.Property.HostingProvider.Linode as Linode @@ -73,7 +74,8 @@ testvm = host "testvm.kitenet.net" darkstar :: Host darkstar = host "darkstar.kitenet.net" - & ipv6 "2001:4830:1600:187::2" -- sixxs tunnel + & ipv6 "2001:4830:1600:187::2" + & Aiccu.hasConfig "T18376" "JHZ2-SIXXS" & Apt.buildDep ["git-annex"] `period` Daily |