X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e38e912b2f2c25d0f76deb462695aaf58f8f397d..a7de9e4abe76f8cd647eea949f99687fcc19254c:/cookbooks/wordpress/templates/default/apache.erb diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb index 200c50089..a1187818a 100644 --- a/cookbooks/wordpress/templates/default/apache.erb +++ b/cookbooks/wordpress/templates/default/apache.erb @@ -11,7 +11,7 @@ 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 %>/ @@ -19,21 +19,12 @@ ServerName <%= @name %> <% @aliases.each do |alias_name| -%> ServerAlias <%= alias_name %> -<% end -%> ServerAdmin webmaster@openstreetmap.org - # - # Enable SSL - # SSLEngine on -<% if @ssl_certificate -%> - SSLCertificateFile /etc/ssl/certs/<%= @ssl_certificate %>.pem - SSLCertificateKeyFile /etc/ssl/private/<%= @ssl_certificate %>.key -<% end -%> -<% if @ssl_certificate -%> - SSLCertificateChainFile /etc/ssl/certs/<%= @ssl_certificate_chain %>.pem -<% end -%> + SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem + SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log @@ -42,13 +33,15 @@ 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 - > RewriteEngine on @@ -66,6 +59,10 @@ AllowOverride AuthConfig Require all granted + + + SetHandler "proxy:unix:/run/php/<%= @name %>.sock|fcgi://127.0.0.1" + /wp-config.php> @@ -75,7 +72,9 @@ /uploads> AllowOverride None AddType text/plain .html .htm .shtml - php_admin_flag engine off + + SetHandler None +