From 08a3c52017b20bb6d4c8a89da019c072a90ddd50 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Jul 2014 12:48:46 -0400 Subject: [PATCH] propellor spin --- config-joey.hs | 4 ++-- src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index 41e2502..55f1a01 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 9f60631..fa8773d 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