summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2016-02-07 17:08:06 -0400
committerJoey Hess2016-02-07 17:08:06 -0400
commit12ff3991270b1aeb9a3822ebbcbee9037cc7f401 (patch)
tree7b87a18461d9e2c57a24a675745fd04bb3d3f55e /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent648e1e50a015636d129bd4d7357c779688685cc0 (diff)
temporarily revert using letsencrypt
It's currently not letting me make a cert for kitenet.net as I made too many during testing.
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 0bb98489..03f2efcb 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -18,7 +18,6 @@ import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Fail2Ban as Fail2Ban
-import qualified Propellor.Property.LetsEncrypt as LetsEncrypt
import Utility.FileMode
import Data.List
@@ -291,21 +290,24 @@ annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-ann
, "git update-server-info"
]
addremote (name, url) = "git remote add " ++ shellEscape name ++ " " ++ shellEscape url
- setupapache = Apache.httpsVirtualHost' hn dir letos
+ setupapache = apacheSite hn True
[ " ServerAlias www."++hn
- , Apache.iconDir
- , " <Directory "++dir++">"
+ , ""
+ , " DocumentRoot /srv/web/"++hn
+ , " <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"
- , Apache.allowAll
+ , Apache.allowAll
, " </Directory>"
]
-letos :: LetsEncrypt.AgreeTOS
-letos = LetsEncrypt.AgreeTOS (Just "id@joeyh.name")
-
apacheSite :: HostName -> Bool -> Apache.ConfigFile -> RevertableProperty NoInfo
apacheSite hn withssl middle = Apache.siteEnabled hn $ apachecfg hn withssl middle
@@ -327,7 +329,11 @@ apachecfg hn withssl middle
, " CustomLog /var/log/apache2/access.log combined"
, " ServerSignature On"
, " "
- , Apache.iconDir
+ , " <Directory \"/usr/share/apache2/icons\">"
+ , " Options Indexes MultiViews"
+ , " AllowOverride None"
+ , Apache.allowAll
+ , " </Directory>"
, "</VirtualHost>"
]
where