Puppet: Support Apache 2.4

refs #9453
This commit is contained in:
Eric Lippmann 2015-07-20 16:40:24 +02:00
parent 5478027855
commit 33aa78d8b7
1 changed files with 30 additions and 15 deletions

View File

@ -1,23 +1,38 @@
Alias /<%= @web_path %> /vagrant/public Alias /<%= @web_path %> "/vagrant/public"
<Directory "/vagrant/public/"> <Directory "/vagrant/public">
Options FollowSymLinks Options SymLinksIfOwnerMatch
AllowOverride None AllowOverride None
Order allow,deny
Allow from all
# SetEnv ICINGAWEB_CONFIGDIR <%= @config %> <IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
SetEnv ICINGAWEB_CONFIGDIR <%= @config %>
EnableSendfile Off EnableSendfile Off
RewriteEngine on <IfModule mod_rewrite.c>
RewriteBase /<%= @web_path %>/ RewriteEngine on
RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteBase /<%= @web_path %>/
RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -d RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteRule ^.*$ - [NC,L] RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ index.php [NC,L] RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
</IfModule>
php_value xdebug.idekey PHPSTORM <IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html
ErrorDocument 404 /error_norewrite.html
</IfModule>
</Directory> </Directory>