summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-02-10 19:57:18 -0400
committerJoey Hess2015-02-10 19:57:18 -0400
commit824ebdd76f64a61f95f424aac56120c016e2e785 (patch)
tree9699e4b29803d360920e711e4906f7bc60f04be3 /src
parent50ff71fd5c41d786a8d3040d93a7f9a815824366 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
1 files changed, 2 insertions, 4 deletions
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`