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

propellor spin

This commit is contained in:
Joey Hess 2014-04-13 12:24:14 -04:00
parent 479045277b
commit 4bcd5816d1
Failed to extract signature
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Propellor/Property/OpenId.hs
View File

@ -6,7 +6,6 @@ import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.Service as Service import qualified Propellor.Property.Service as Service
import Data.List import Data.List
import System.Posix.Files
providerFor :: [UserName] -> String -> Property providerFor :: [UserName] -> String -> Property
providerFor users baseurl = propertyList desc $ providerFor users baseurl = propertyList desc $

10
config-joey.hs
View File

@ -48,6 +48,11 @@ hosts =
& cname "ancient.kitenet.net" & cname "ancient.kitenet.net"
& Docker.docked hosts "ancient-kitenet" & Docker.docked hosts "ancient-kitenet"
-- I'd rather this container were on diatom, but
-- docker.io is not available in stable.
& cname "kgb.kitenet.net"
& Docker.docked hosts "kgb-server"
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Apt.installed ["git-annex", "mtr", "screen"] & Apt.installed ["git-annex", "mtr", "screen"]
@ -86,15 +91,12 @@ hosts =
`requires` Ssh.authorizedKeys "family" `requires` Ssh.authorizedKeys "family"
`requires` User.accountFor "family" `requires` User.accountFor "family"
& Apt.installed ["git", "git-annex", "rsync", "kgb-client-git"] & Apt.installed ["git", "git-annex", "rsync", "kgb-client-git"]
& File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf"
& Git.daemonRunning "/srv/git" & Git.daemonRunning "/srv/git"
-- ssh keys for branchable and github repo hooks -- ssh keys for branchable and github repo hooks
-- TODO: upgrade to newer git-annex-shell for notification -- TODO: upgrade to newer git-annex-shell for notification
-- gitweb -- gitweb
& cname "kgb.kitenet.net"
& Docker.docked hosts "kgb-server"
& File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf"
& cname "downloads.kitenet.net" & cname "downloads.kitenet.net"
& Apt.buildDep ["git-annex"] `period` Daily & Apt.buildDep ["git-annex"] `period` Daily
-- downloads.kitenet.net setup (including ssh key to turtle) -- downloads.kitenet.net setup (including ssh key to turtle)