diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-02-10 19:57:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-10 19:57:18 -0400 |
| commit | 824ebdd76f64a61f95f424aac56120c016e2e785 (patch) | |
| tree | 9699e4b29803d360920e711e4906f7bc60f04be3 | |
| parent | 50ff71fd5c41d786a8d3040d93a7f9a815824366 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 2 | ||||
| -rw-r--r-- | 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` |