From 456dd534ce2984535a9fc36bad2aff9e6ee2863a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Apr 2014 11:58:22 -0400 Subject: propellor spin --- config-joey.hs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 394881b4..71048cf3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -73,6 +73,7 @@ hosts = & cname "git.kitenet.net" & Ssh.hostKey SshDsa & Ssh.hostKey SshRsa + & Ssh.hostKey SshEcdsa & Obnam.backup "/srv/git" "33 3 * * *" [ "--repository=sftp://2318@usw-s002.rsync.net/~/git.kitenet.net" , "--encrypt-with=1B169BE1" @@ -83,15 +84,20 @@ hosts = `requires` Ssh.knownHost hosts "usw-s002.rsync.net" "root" `requires` Ssh.authorizedKeys "family" `requires` User.accountFor "family" - & Apt.installed ["git", "git-annex", "rsync"] + & Apt.installed ["git", "git-annex", "rsync", "kgb-client"] & Git.daemonRunning "/srv/git" - -- copy wren's ssh host key - -- TODO: upgrade to newer git-annex-shell for notification - -- kgb installation and setup -- ssh keys for branchable and github repo hooks + -- TODO: upgrade to newer git-annex-shell for notification -- gitweb - -- downloads.kitenet.net setup (including ssh key to turtle) + + & cname "kgb.kitenet.net" + & Apt.serviceInstalledRunning "kbg-bot" + & File.hasPrivContent "/etc/kgb-bot/kgb.conf" + & File.hasPrivContent "/etc/kgb-bot/kgb-client.conf" + + & cname "downloads.kitenet.net" & Apt.buildDep ["git-annex"] `period` Daily + -- downloads.kitenet.net setup (including ssh key to turtle) -- I don't run this system, so only relevant property is its -- public key. -- cgit v1.3-2-g0d8e