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 /src/Propellor/Property/SiteSpecific | |
| parent | fcd124fe7e28e7abdfa8db15a4fbc3524aa98de0 (diff) | |
| parent | 1f232b6be97c7e5480adb35811efdb9ab33ae5db (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 7e6d3f8c..03f2efcb 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -140,6 +140,7 @@ oldUseNetServer hosts = propertyList "olduse.net server" $ props [ "--repository=sftp://2318@usw-s002.rsync.net/~/olduse.net" , "--client-name=spool" , "--ssh-key=" ++ keyfile + , Obnam.keepParam [Obnam.KeepDays 30] ] Obnam.OnlyClient `requires` Ssh.userKeyAt (Just keyfile) (User "root") @@ -194,6 +195,7 @@ mumbleServer hosts = combineProperties hn $ props [ "--repository=sftp://2318@usw-s002.rsync.net/~/" ++ hn ++ ".obnam" , "--ssh-key=" ++ sshkey , "--client-name=mumble" + , Obnam.keepParam [Obnam.KeepDays 30] ] Obnam.OnlyClient `requires` Ssh.userKeyAt (Just sshkey) (User "root") @@ -213,6 +215,7 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props [ "--repository=sftp://2318@usw-s002.rsync.net/~/git.kitenet.net" , "--ssh-key=" ++ sshkey , "--client-name=wren" -- historical + , Obnam.keepParam [Obnam.KeepDays 30] ] Obnam.OnlyClient (Gpg.GpgKeyId "1B169BE1") `requires` Ssh.userKeyAt (Just sshkey) (User "root") |