X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7cc2c6d477c5255d13bf26f676afb769d337ab20..48811b45144abd8762567fe74634ce986565de3b:/cookbooks/wordpress/templates/default/apache.erb diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb index 3695fc2b7..59b63f753 100644 --- a/cookbooks/wordpress/templates/default/apache.erb +++ b/cookbooks/wordpress/templates/default/apache.erb @@ -12,6 +12,7 @@ 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 %>/ @@ -23,10 +24,9 @@ ServerAdmin webmaster@openstreetmap.org - # - # Enable SSL - # SSLEngine on + 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 @@ -35,6 +35,11 @@ DocumentRoot <%= @directory %> <% @urls.each do |url,directory| -%> Alias <%= url %> <%= directory %> + > + AllowOverride None + php_admin_flag engine off + Require all granted + <% end -%> php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/ @@ -50,11 +55,13 @@ RewriteRule ^wp-includes/[^/]+\.php$ - [F,L] RewriteRule ^wp-includes/js/tinymce/langs/.+\.php - [F,L] RewriteRule ^wp-includes/theme-compat/ - [F,L] + RewriteRule ^readme\.html$ [F,L] RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule . /index.php [L] Options -Indexes + AllowOverride AuthConfig Require all granted @@ -77,6 +84,10 @@ Require all denied + + Require all denied + + Require all denied