cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-07-22 16:40:11 -04:00
parent ed83966460
commit 660f77c28f
Failed to extract signature
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Propellor/Property/Apache.hs
View File

@ -68,3 +68,19 @@ multiSSL = "/etc/apache2/conf.d/ssl" `File.hasContent`
]
`describe` "apache SNI enabled"
`onChange` reloaded
-- | Config file fragment that can be inserted into a <Directory>
-- stanza to allow global read access to the directory.
--
-- Works with multiple versions of apache that have different ways to do
-- it.
allowAll :: String
allowAll = unlines
[ "<IfVersion < 2.4>"
, "Order allow,deny"
, "allow from all"
, "</IfVersion>"
, "<IfVersion >= 2.4>"
, "Require all granted"
, "</IfVersion>"
]

27
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -61,9 +61,7 @@ oldUseNetServer hosts = propertyList ("olduse.net server")
, " <Directory " ++ datadir ++ "/>"
, " Options Indexes FollowSymlinks"
, " AllowOverride None"
-- I had this in the file before.
-- This may be needed by a newer version of apache?
--, " Require all granted"
, Apache.allowAll
, " </Directory>"
]
]
@ -578,9 +576,7 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /var/www>"
, " Options Indexes FollowSymLinks MultiViews ExecCGI Includes"
, " AllowOverride None"
, " Order allow,deny"
, " allow from all"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
, "ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/"
@ -588,24 +584,19 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /usr/lib/cgi-bin>"
, " AllowOverride None"
, " Options ExecCGI"
, " Order allow,deny"
, " allow from all"
, Apache.allowAll
, "</Directory>"
, "Alias /pipermail/ /var/lib/mailman/archives/public/"
, "<Directory /var/lib/mailman/archives/public/>"
, " Options Indexes MultiViews FollowSymlinks"
, " AllowOverride None"
, " Order allow,deny"
, " Allow from all"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
, "Alias /images/ /usr/share/images/"
, "<Directory /usr/share/images/>"
, " Options Indexes MultiViews"
, " AllowOverride None"
, " Order allow,deny"
, " Allow from all"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
, "RewriteEngine On"
@ -672,7 +663,7 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /home/anna/html/>"
, " Options Indexes ExecCGI"
, " AllowOverride None"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
]
, alias "sows-ear.kitenet.net"
@ -683,7 +674,7 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /srv/web/sows-ear.kitenet.net>"
, " Options FollowSymLinks"
, " AllowOverride None"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
]
, alias "wortroot.kitenet.net"
@ -694,7 +685,7 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /srv/web/wortroot.kitenet.net>"
, " Options FollowSymLinks"
, " AllowOverride None"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
]
, alias "joey.kitenet.net"
@ -703,7 +694,7 @@ legacyWebSites = propertyList "legacy web sites"
, "<Directory /home/joey/html/>"
, " Options Indexes ExecCGI"
, " AllowOverride None"
, " Require all granted"
, Apache.allowAll
, "</Directory>"
, "RewriteEngine On"