supybot: switch to git:// instead of ssh based git access

[chef.git] / cookbooks / wordpress / templates / default / apache.erb

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 3d0b97ade6042fb3f26a17de916c49acf66facc5..200c500894c285c1a0743e4fe7c306c07d432990 100644 (file)
--- 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 -%>
   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
 
   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 ^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]
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]


@@ -82,6 +86,10 @@
     Require all denied
   </Directory>
 
     Require all denied
   </Directory>
 

+  <Files ~ "\.(txt|md)$">
+    Require all denied
+  </Files>
+

   <Files ~ "~$">
     Require all denied
   </Files>
   <Files ~ "~$">
     Require all denied
   </Files>