diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-15 15:08:40 -0400 |
| commit | ba058d77a778058887f5c678b10e3c5ac599c50c (patch) | |
| tree | f841754cb52d41ccafee719a1fc0b47c766ad7b2 /config-joey.hs | |
| parent | a1e3c4e9e060c58a738501030a197557e20e88db (diff) | |
| parent | 0592ab4bd7deaadaa971bc7d19b7beaca5a1253e (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config-joey.hs b/config-joey.hs index 76860cb6..6039a529 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -18,7 +18,7 @@ import qualified Propellor.Property.OpenId as OpenId import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Git as Git import qualified Propellor.Property.Apache as Apache -import qualified Propellor.Property.Service as Service +import qualified Propellor.Property.Postfix as Postfix import qualified Propellor.Property.SiteSpecific.GitHome as GitHome import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites @@ -41,7 +41,9 @@ hosts = -- (o) ` & Apt.unattendedUpgrades & Network.ipv6to4 & Tor.isBridge + & Postfix.satellite & Docker.configured + & cname "shell.olduse.net" & JoeySites.oldUseNetShellBox @@ -63,6 +65,7 @@ hosts = -- (o) ` , standardSystem "orca.kitenet.net" Unstable "amd64" & Hostname.sane & Apt.unattendedUpgrades + & Postfix.satellite & Docker.configured & Docker.docked hosts "amd64-git-annex-builder" & Docker.docked hosts "i386-git-annex-builder" @@ -80,6 +83,7 @@ hosts = -- (o) ` & Apt.unattendedUpgrades & Apt.serviceInstalledRunning "ntp" & Dns.zones myDnsSecondary + & Postfix.satellite & Apt.serviceInstalledRunning "apache2" & File.hasPrivContent "/etc/ssl/certs/web.pem" @@ -98,19 +102,14 @@ hosts = -- (o) ` "downloads.kitenet.net" "840760dc-08f0-11e2-8c61-576b7e66acfd" [("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")] - -- rsync server for git-annex autobuilders - & Apt.installed ["rsync"] - & File.hasPrivContent "/etc/rsyncd.conf" - & File.hasPrivContent "/etc/rsyncd.secrets" - & "/etc/default/rsync" `File.containsLine` "RSYNC_ENABLE=true" - `describe` "rsync server enabled" - `onChange` Service.running "rsync" + & JoeySites.annexRsyncServer & cname "tmp.kitenet.net" & JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git" "tmp.kitenet.net" "26fd6e38-1226-11e2-a75f-ff007033bdba" [] + & JoeySites.twitRss & Apt.installed ["ntop"] |