summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-07-23 12:48:46 -0400
committerJoey Hess2014-07-23 12:48:46 -0400
commit08a3c52017b20bb6d4c8a89da019c072a90ddd50 (patch)
tree9b927f09ab64c95e5f0c332ee27a08f2449700bd
parent6cf770c6994bb14be745021293344926125745c5 (diff)
propellor spin
-rw-r--r--config-joey.hs4
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 41e25025..55f1a01e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -150,9 +150,9 @@ hosts = -- (o) `
& JoeySites.annexWebSite "/srv/git/downloads.git"
"downloads.kitenet.net"
"840760dc-08f0-11e2-8c61-576b7e66acfd"
- [("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")]
+ [("turtle", "ssh://usbackup.kitenet.net/~/lib/downloads/")]
`requires` Ssh.keyImported SshRsa "joey" (Context "downloads.kitenet.net")
- `requires` Ssh.knownHost hosts "turtle.kitenet.net" "joey"
+ `requires` Ssh.knownHost hosts "usbackup.kitenet.net" "joey"
& JoeySites.gitAnnexDistributor
& alias "tmp.kitenet.net"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 9f60631c..fa8773de 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -114,11 +114,11 @@ mumbleServer hosts = combineProperties hn
[ Apt.serviceInstalledRunning "mumble-server"
, Obnam.latestVersion
, Obnam.backup "/var/lib/mumble-server" "55 5 * * *"
- [ "--repository=sftp://joey@turtle.kitenet.net/~/lib/backup/" ++ hn ++ ".obnam"
+ [ "--repository=sftp://joey@usbackup.kitenet.net/~/lib/backup/" ++ hn ++ ".obnam"
, "--client-name=mumble"
] Obnam.OnlyClient
`requires` Ssh.keyImported SshRsa "root" (Context hn)
- `requires` Ssh.knownHost hosts "turtle.kitenet.net" "root"
+ `requires` Ssh.knownHost hosts "usbackup.kitenet.net" "root"
, trivial $ cmdProperty "chown" ["-R", "mumble-server:mumble-server", "/var/lib/mumble-server"]
]
where