cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-17 22:30:37 -04:00
parent 27ff3e9f21 520b864123
commit 5b4f3d109e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -52,13 +52,13 @@ gitServer :: [Host] -> Property
gitServer hosts = propertyList "git.kitenet.net setup" gitServer hosts = propertyList "git.kitenet.net setup"
[ Obnam.latestVersion [ Obnam.latestVersion
, Obnam.backup "/srv/git" "33 3 * * *" , Obnam.backup "/srv/git" "33 3 * * *"
[ "--repository=sftp://joey@turtle.kitenet.net/~/lib/backup/git.kitenet.net.obnam" [ "--repository=sftp://2318@usw-s002.rsync.net/~/git.kitenet.net"
, "--encrypt-with=1B169BE1" , "--encrypt-with=1B169BE1"
, "--client-name=wren" , "--client-name=wren"
] Obnam.OnlyClient ] Obnam.OnlyClient
`requires` Gpg.keyImported "1B169BE1" "root" `requires` Gpg.keyImported "1B169BE1" "root"
`requires` Ssh.keyImported SshRsa "root" `requires` Ssh.keyImported SshRsa "root"
`requires` Ssh.knownHost hosts "turtle.kitenet.net" "root" `requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root"
`requires` Ssh.authorizedKeys "family" `requires` Ssh.authorizedKeys "family"
`requires` User.accountFor "family" `requires` User.accountFor "family"
, Apt.installed ["git", "rsync", "kgb-client-git", "gitweb"] , Apt.installed ["git", "rsync", "kgb-client-git", "gitweb"]