cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-02-10 19:57:18 -04:00
parent 50ff71fd5c
commit 824ebdd76f
Failed to extract signature
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-joey.hs
View File

@ -204,6 +204,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.configured & Docker.configured
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Docker.docked oldusenetShellBox & Docker.docked oldusenetShellBox
& JoeySites.gitServer hosts
diatom :: Host diatom :: Host
diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"

6
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -147,10 +147,8 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props
`requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net") `requires` Ssh.authorizedKeys "family" (Context "git.kitenet.net")
`requires` User.accountFor "family" `requires` User.accountFor "family"
& Apt.installed ["git", "rsync", "gitweb"] & Apt.installed ["git", "rsync", "gitweb"]
-- backport avoids channel flooding on branch merge & Apt.installed ["kgb-client"]
& Apt.installedBackport ["kgb-client"] & Apt.installed ["git-annex"]
-- backport supports ssh event notification
& Apt.installedBackport ["git-annex"]
& File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext
& Git.daemonRunning "/srv/git" & Git.daemonRunning "/srv/git"
& "/etc/gitweb.conf" `File.containsLines` & "/etc/gitweb.conf" `File.containsLines`