summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-07-17 15:53:12 -0400
committerJoey Hess2014-07-17 15:53:12 -0400
commit330c00efa4de9f927d5ce932bcbe6144f82dbcd9 (patch)
tree2189d38f80d9a0c8f845f75bc86d78fc60018a71
parenta788c957d2eddaa0af7e240be069f048c462df0b (diff)
propellor spin
-rw-r--r--config-joey.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
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