From 330c00efa4de9f927d5ce932bcbe6144f82dbcd9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Jul 2014 15:53:12 -0400 Subject: propellor spin --- config-joey.hs | 3 +++ src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index e5ee45b4..9295119c 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -91,6 +91,7 @@ hosts = -- (o) ` & Ssh.hostKeys (Context "kitenet.net") & Obnam.backup "/" "33 1 * * *" [ "--repository=sftp://joey@eubackup.kitenet.net/~/lib/backup/kite.obnam" + , "--client-name=kitenet.net" , "--encrypt-with=" , "--exclude=/var/cache" , "--exclude=/var/tmp" @@ -134,6 +135,8 @@ hosts = -- (o) ` "downloads.kitenet.net" "840760dc-08f0-11e2-8c61-576b7e66acfd" [("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")] + `requires` Ssh.keyImported SshRsa "joey" (Context "downloads.kitenet.net") + `requires` Ssh.knownHost hosts "turtle.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 5c9ac941..db9be1c2 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -142,7 +142,7 @@ gitServer hosts = propertyList "git.kitenet.net setup" , Obnam.backup "/srv/git" "33 3 * * *" [ "--repository=sftp://2318@usw-s002.rsync.net/~/git.kitenet.net" , "--encrypt-with=1B169BE1" - , "--client-name=wren" + , "--client-name=wren" -- historical ] Obnam.OnlyClient `requires` Gpg.keyImported "1B169BE1" "root" `requires` Ssh.keyImported SshRsa "root" (Context "git.kitenet.net") @@ -206,8 +206,6 @@ annexWebSite hosts origin hn uuid remotes = propertyList (hn ++" website using g dir = "/srv/web/" ++ hn postupdatehook = dir ".git/hooks/post-update" setup = userScriptProperty "joey" setupscript - `requires` Ssh.keyImported SshRsa "joey" (Context hn) - `requires` Ssh.knownHost hosts "turtle.kitenet.net" "joey" setupscript = [ "cd " ++ shellEscape dir , "git config annex.uuid " ++ shellEscape uuid -- cgit v1.2.3