X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5919a0168e927c655ce23acc885413864f0ebfcf..235dd57874e178a39c006b138772c608f3e19a40:/cookbooks/wordpress/templates/default/apache.erb diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb index 3d0b97ade..200c50089 100644 --- a/cookbooks/wordpress/templates/default/apache.erb +++ b/cookbooks/wordpress/templates/default/apache.erb @@ -31,6 +31,9 @@ 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 -%> CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log @@ -54,6 +57,7 @@ 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] @@ -82,6 +86,10 @@ Require all denied + + Require all denied + + Require all denied