diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-19 22:22:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-19 22:22:23 -0400 |
| commit | 87c1fe982a391461d66efa99688ada9a0c808226 (patch) | |
| tree | d16e9b529223bbf2d3b362cc16bee0ffd7933e13 | |
| parent | 9770cc80f783347581fa4f5265ce0e44c7dcc578 (diff) | |
propellor spin
| -rw-r--r-- | Propellor/Property/SiteSpecific/JoeySites.hs | 13 | ||||
| -rw-r--r-- | config-joey.hs | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index b43d83f8..88f256c4 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -102,6 +102,19 @@ kgbServer = withOS desc $ \o -> case o of where desc = "kgb.kitenet.net setup" +mumbleServer :: [Host] -> Property +mumbleServer hosts = combineProperties "mumble.debian.net" + [ Obnam.latestVersion + , Obnam.backup "/var/lib/mumble-server" "55 5 * * *" + [ "--repository=sftp://joey@turtle.kitenet.net/~/lib/backup/mumble.debian.net.obnam" + , "--client-name=mumble" + ] Obnam.OnlyClient + `requires` Ssh.keyImported SshRsa "root" + `requires` Ssh.knownHost hosts "turtle.kitenet.net" "root" + `requires` User.accountFor "mumble-server" + , Apt.installed ["mumble-server"] + ] + -- git.kitenet.net and git.joeyh.name gitServer :: [Host] -> Property gitServer hosts = propertyList "git.kitenet.net setup" diff --git a/config-joey.hs b/config-joey.hs index 5dd466ee..98e8f6b6 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -64,6 +64,9 @@ hosts = -- (o) ` -- I'd rather this were on diatom, but it needs unstable. & alias "kgb.kitenet.net" & JoeySites.kgbServer + + & alias "mumble.kitenet.net" + & JoeySites.mumbleServer hosts & alias "ns9.kitenet.net" & myDnsSecondary @@ -168,7 +171,7 @@ hosts = -- (o) ` , standardContainer "ancient-kitenet" Stable "amd64" & Docker.publish "1994:80" & Apt.serviceInstalledRunning "apache2" - & Git.cloned "root" "git://git.kitenet.net/kitewiki" "/var/www" + & Git.cloned "root" "git://kitenet-net.branchable.com/" "/var/www" (Just "remotes/origin/old-kitenet.net") -- git-annex autobuilder containers |