diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-13 12:24:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-13 12:24:14 -0400 |
| commit | 4bcd5816d156400282e160c1ae4d5ea4b2f78bed (patch) | |
| tree | c4b0103dff0906fe27b4d3917ea7fcbcbfb7a7fd | |
| parent | 479045277b29919797cee341b11d30bbd15ab3d7 (diff) | |
propellor spin
| -rw-r--r-- | Propellor/Property/OpenId.hs | 1 | ||||
| -rw-r--r-- | config-joey.hs | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Propellor/Property/OpenId.hs b/Propellor/Property/OpenId.hs index d06bf88f..4c562175 100644 --- a/Propellor/Property/OpenId.hs +++ b/Propellor/Property/OpenId.hs @@ -6,7 +6,6 @@ import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Service as Service import Data.List -import System.Posix.Files providerFor :: [UserName] -> String -> Property providerFor users baseurl = propertyList desc $ diff --git a/config-joey.hs b/config-joey.hs index 2245f8dd..ca7a0219 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -48,6 +48,11 @@ hosts = & cname "ancient.kitenet.net" & 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 & Apt.installed ["git-annex", "mtr", "screen"] @@ -86,14 +91,11 @@ hosts = `requires` Ssh.authorizedKeys "family" `requires` User.accountFor "family" & Apt.installed ["git", "git-annex", "rsync", "kgb-client-git"] + & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" & Git.daemonRunning "/srv/git" -- ssh keys for branchable and github repo hooks -- TODO: upgrade to newer git-annex-shell for notification -- gitweb - - & cname "kgb.kitenet.net" - & Docker.docked hosts "kgb-server" - & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" & cname "downloads.kitenet.net" & Apt.buildDep ["git-annex"] `period` Daily |