X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/891d124699c14c4b91f8924d06dd2af8697e6e87..c9156c712b8e712139466e96fba4a00deb321198:/cookbooks/wordpress/templates/default/apache.erb diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb index 6281fc2db..ea2e20c0c 100644 --- a/cookbooks/wordpress/templates/default/apache.erb +++ b/cookbooks/wordpress/templates/default/apache.erb @@ -11,7 +11,6 @@ CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log -<% if @ssl_enabled -%> RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ RedirectPermanent / https://<%= @name %>/ @@ -20,7 +19,6 @@ ServerName <%= @name %> <% @aliases.each do |alias_name| -%> ServerAlias <%= alias_name %> -<% end -%> ServerAdmin webmaster@openstreetmap.org @@ -35,12 +33,17 @@ DocumentRoot <%= @directory %> <% @urls.each do |url,directory| -%> Alias <%= url %> <%= directory %> + > + AllowOverride None + Require all granted + + SetHandler None + + <% end -%> - php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/ - php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open" - php_value upload_max_filesize 70M - php_value post_max_size 100M + ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=<%= @directory %>/:/usr/share/php/:/tmp/\ndisable_functions=exec,shell_exec,system,passthru,popen,proc_open" + ProxyFCGISetEnvIf "true" PHP_VALUE "upload_max_filesize=70M\npost_max_size=100M" > RewriteEngine on @@ -68,7 +71,9 @@ /uploads> AllowOverride None AddType text/plain .html .htm .shtml - php_admin_flag engine off + + SetHandler None +