diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-22 16:40:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-22 16:40:11 -0400 |
| commit | 660f77c28fe11534139e8d9ecda2d573921fa8dd (patch) | |
| tree | 67c85b0e02d37ed31f2c375f85121a635ba0add3 /src/Propellor/Property/SiteSpecific | |
| parent | ed8396646039c68eeb7aec7788258205fd998a5f (diff) | |
propellor spin
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 40e1bead..51d3d60c 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -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" |