From 824ebdd76f64a61f95f424aac56120c016e2e785 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Feb 2015 19:57:18 -0400 Subject: propellor spin --- config-joey.hs | 2 ++ src/Propellor/Property/SiteSpecific/JoeySites.hs | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index 2da16c57..59b11044 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 f7bbb466..ae71a3ca 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` -- cgit v1.3-2-g0d8e