diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-15 13:46:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-15 13:46:53 -0400 |
| commit | beb905be9231a903afd2e2228e89e7e047384ea7 (patch) | |
| tree | 543373fadb06aba5211f678695f8ab2b743f4c60 /config-joey.hs | |
| parent | 90a982fcb35e35fa2344003202b40192dc13fab4 (diff) | |
| parent | 269996e25d8f5481024f472a57debfd51dfcc703 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/keyring.gpg
privdata.joey/privdata.gpg
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs index 74647df9..583c3bd5 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -10,7 +10,6 @@ import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Network as Network import qualified Propellor.Property.Service as Service import qualified Propellor.Property.Ssh as Ssh -import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Cron as Cron import qualified Propellor.Property.Sudo as Sudo import qualified Propellor.Property.User as User @@ -115,17 +114,15 @@ kite = standardSystemUnhardened "kite.kitenet.net" Unstable "amd64" & Ssh.passwordAuthentication True -- Since ssh password authentication is allowed: & Apt.serviceInstalledRunning "fail2ban" - & Obnam.backup "/" "33 1 * * *" + & Obnam.backupEncrypted "/" "33 1 * * *" [ "--repository=sftp://joey@eubackup.kitenet.net/~/lib/backup/kite.obnam" , "--client-name=kitenet.net" - , "--encrypt-with=98147487" , "--exclude=/var/cache" , "--exclude=/var/tmp" , "--exclude=/home/joey/lib" , "--exclude=.*/tmp/" , "--one-file-system" - ] Obnam.OnlyClient - `requires` Gpg.keyImported "98147487" "root" + ] Obnam.OnlyClient "98147487" `requires` Ssh.keyImported SshRsa "root" (Context "kite.kitenet.net") `requires` Ssh.knownHost hosts "eubackup.kitenet.net" "root" |