summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-17 22:30:37 -0400
committerJoey Hess2014-04-17 22:30:37 -0400
commit5b4f3d109ee7393b1e44cac60b43def2ce4c8b24 (patch)
tree883e4419a7e982f414fb75b3e521331102d3a89b
parent27ff3e9f2188f899c1130b5876ed19ca124df3b4 (diff)
parent520b86412328a43a65505e7128aa3bd5aa4bb1c0 (diff)
Merge branch 'joeyconfig'
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index faf14038..3d0ff246 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -52,13 +52,13 @@ gitServer :: [Host] -> Property
gitServer hosts = propertyList "git.kitenet.net setup"
[ Obnam.latestVersion
, 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"
, "--client-name=wren"
] Obnam.OnlyClient
`requires` Gpg.keyImported "1B169BE1" "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` User.accountFor "family"
, Apt.installed ["git", "rsync", "kgb-client-git", "gitweb"]