summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-11-17 17:02:47 -0400
committerJoey Hess <joey@kitenet.net>2014-11-17 17:02:47 -0400
commit2fab1a08b4f197874ad6c613f118315ab0d474a3 (patch)
tree025353fea85436242bb706cd75914d85c3fca98f /config-joey.hs
parent90f5cff061e11a06d3f37fdd5424b49678a2b07d (diff)
parentfbd8ea3b3d46b8cb56f3b9c82847cc849a37f89d (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 583c3bd5..ee0c54a8 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -23,6 +23,7 @@ import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.Obnam as Obnam
+import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean
import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
import qualified Propellor.Property.HostingProvider.Linode as Linode
@@ -122,7 +123,7 @@ kite = standardSystemUnhardened "kite.kitenet.net" Unstable "amd64"
, "--exclude=/home/joey/lib"
, "--exclude=.*/tmp/"
, "--one-file-system"
- ] Obnam.OnlyClient "98147487"
+ ] Obnam.OnlyClient (Gpg.GpgKeyId "98147487")
`requires` Ssh.keyImported SshRsa "root"
(Context "kite.kitenet.net")
`requires` Ssh.knownHost hosts "eubackup.kitenet.net" "root"