X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/48811b45144abd8762567fe74634ce986565de3b..68e068818d559ef35bdf2a138a93596337828ef9:/cookbooks/wordpress/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb index 59b63f753..0e0790fdb 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 @@ -37,16 +35,13 @@ Alias <%= url %> <%= directory %> > AllowOverride None - php_admin_flag engine off 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 - > RewriteEngine on @@ -64,6 +59,10 @@ AllowOverride AuthConfig Require all granted + + + SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1" + /wp-config.php> @@ -73,7 +72,9 @@ /uploads> AllowOverride None AddType text/plain .html .htm .shtml - php_admin_flag engine off + + SetHandler None +