diff --git a/config-joey.hs b/config-joey.hs index 2da16c5..59b1104 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -204,6 +204,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" & Docker.configured & Docker.garbageCollected `period` Daily & Docker.docked oldusenetShellBox + + & JoeySites.gitServer hosts diatom :: Host diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f7bbb46..ae71a3c 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -147,10 +147,8 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props `requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net") `requires` User.accountFor "family" & Apt.installed ["git", "rsync", "gitweb"] - -- backport avoids channel flooding on branch merge - & Apt.installedBackport ["kgb-client"] - -- backport supports ssh event notification - & Apt.installedBackport ["git-annex"] + & Apt.installed ["kgb-client"] + & Apt.installed ["git-annex"] & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext & Git.daemonRunning "/srv/git" & "/etc/gitweb.conf" `File.containsLines`