summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs23
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
2 files changed, 15 insertions, 15 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 6acba336..99deef43 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -173,13 +173,23 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& alias "mail.kitenet.net"
& JoeySites.kiteMailServer
+ & JoeySites.kitenetHttps
+ & Apache.multiSSL
+ & JoeySites.legacyWebSites
+
+ & alias "git.kitenet.net"
+ & alias "git.joeyh.name"
+ & JoeySites.gitServer hosts
+
+ & JoeySites.downloads hosts
+ & JoeySites.gitAnnexDistributor
+ & JoeySites.tmp
+
& alias "ns4.kitenet.net"
& myDnsSecondary
& alias "ns4.branchable.com"
& branchableSecondary
- & JoeySites.legacyWebSites
-
& alias "bitlbee.kitenet.net"
& Apt.serviceInstalledRunning "bitlbee"
& "/etc/bitlbee/bitlbee.conf" `File.hasContent`
@@ -204,15 +214,6 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.configured
& Docker.garbageCollected `period` Daily
! Docker.docked oldusenetShellBox
-
- & alias "git.kitenet.net"
- & alias "git.joeyh.name"
- & JoeySites.gitServer hosts
-
- & JoeySites.downloads hosts
- & JoeySites.gitAnnexDistributor
-
- & JoeySites.tmp
diatom :: Host
diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index edca2aa4..3341a3dd 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -221,14 +221,14 @@ annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-ann
, " <Directory /srv/web/"++hn++">"
, " Options FollowSymLinks"
, " AllowOverride None"
+ , Apache.allowAll
, " </Directory>"
, " <Directory /srv/web/"++hn++">"
, " Options Indexes FollowSymLinks ExecCGI"
, " AllowOverride None"
, " AddHandler cgi-script .cgi"
, " DirectoryIndex index.html index.cgi"
- , " Order allow,deny"
- , " allow from all"
+ , Apache.allowAll
, " </Directory>"
]
@@ -256,8 +256,7 @@ apachecfg hn withssl middle
, " <Directory \"/usr/share/apache2/icons\">"
, " Options Indexes MultiViews"
, " AllowOverride None"
- , " Order allow,deny"
- , " Allow from all"
+ , Apache.allowAll
, " </Directory>"
, "</VirtualHost>"
]