diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-02-07 17:59:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-07 17:59:17 -0400 |
| commit | a568c7c0367b1ef6f01d0e8e638bb0f3fc7b2cb8 (patch) | |
| tree | da2b879619a60e4aa118a7d60316c5740593d6be /config-joey.hs | |
| parent | fcd124fe7e28e7abdfa8db15a4fbc3524aa98de0 (diff) | |
| parent | 1f232b6be97c7e5480adb35811efdb9ab33ae5db (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-joey.hs b/config-joey.hs index 5e263de6..75333d78 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -261,19 +261,20 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" -- Since ssh password authentication is allowed: & Fail2Ban.installed & Obnam.backupEncrypted "/" (Cron.Times "33 1 * * *") - [ "--repository=sftp://joey@eubackup.kitenet.net/~/lib/backup/kite.obnam" + [ "--repository=sftp://2318@usw-s002.rsync.net/~/kite.obnam" , "--client-name=kitenet.net" , "--exclude=/var/cache" , "--exclude=/var/tmp" , "--exclude=/home/joey/lib" , "--exclude=.*/tmp/" , "--one-file-system" + , Obnam.keepParam [Obnam.KeepDays 7, Obnam.KeepWeeks 4, Obnam.KeepMonths 6] ] Obnam.OnlyClient (Gpg.GpgKeyId "98147487") `requires` Ssh.userKeys (User "root") (Context "kite.kitenet.net") [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5Gza2sNqSKfNtUN4dN/Z3rlqw18nijmXFx6df2GtBoZbkIak73uQfDuZLP+AXlyfHocwdkdHEf/zrxgXS4EokQMGLZhJ37Pr3edrEn/NEnqroiffw7kyd7EqaziA6UOezcLTjWGv+Zqg9JhitYs4WWTpNzrPH3yQf1V9FunZnkzb4gJGndts13wGmPEwSuf+QHbgQvjMOMCJwWSNcJGdhDR66hFlxfG26xx50uIczXYAbgLfHp5W6WuR/lcaS9J6i7HAPwcsPDA04XDinrcpl29QwsMW1HyGS/4FSCgrDqNZ2jzP49Bka78iCLRqfl1efyYas/Zo1jQ0x+pxq2RMr root@kite") ] - `requires` Ssh.knownHost hosts "eubackup.kitenet.net" (User "root") + `requires` Ssh.knownHost hosts "usw-s002.rsync.net" (User "root") & Apt.serviceInstalledRunning "ntp" & "/etc/timezone" `File.hasContent` ["US/Eastern"] |