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 /src/Propellor/Property/SiteSpecific | |
| parent | 90a982fcb35e35fa2344003202b40192dc13fab4 (diff) | |
| parent | 269996e25d8f5481024f472a57debfd51dfcc703 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/keyring.gpg
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index bd9e01e2..7b8216fb 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -142,12 +142,11 @@ obnamLowMem = combineProperties "obnam tuned for low memory use" gitServer :: [Host] -> Property gitServer hosts = propertyList "git.kitenet.net setup" [ Obnam.latestVersion - , Obnam.backup "/srv/git" "33 3 * * *" + , Obnam.backupEncrypted "/srv/git" "33 3 * * *" [ "--repository=sftp://2318@usw-s002.rsync.net/~/git.kitenet.net" , "--encrypt-with=1B169BE1" , "--client-name=wren" -- historical - ] Obnam.OnlyClient - `requires` Gpg.keyImported "1B169BE1" "root" + ] Obnam.OnlyClient "1B169BE1" `requires` Ssh.keyImported SshRsa "root" (Context "git.kitenet.net") `requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root" `requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net") |