Sort certificates in a stable order

[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 1af8f3bb32d0732d3bc13b304b76abf4e82b9e92..59b63f753b72f0b5562483a506c923e307aaf5d1 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,9 +11,35 @@
   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
 

+<% if @ssl_enabled -%>
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+
+  ServerAdmin webmaster@openstreetmap.org
+
+  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
+<% end -%>
+

   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>
   Alias <%= url %> <%= directory %>
   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>
   Alias <%= url %> <%= directory %>

+  <Directory <%= directory %>>
+    AllowOverride None
+    php_admin_flag engine off
+    Require all granted
+  </Directory>

 <% end -%>
 
   php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
 <% end -%>
 
   php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/


@@ -29,15 +55,19 @@
     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]

+

     Options -Indexes
     Options -Indexes

+    AllowOverride AuthConfig
+
+    Require all granted

   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 
   <Directory <%= @directory %>/uploads>
   </Files>
 
   <Directory <%= @directory %>/uploads>


@@ -47,17 +77,18 @@
   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   <Directory ~ "\.git">
   </Directory>
 
   <Directory ~ "\.git">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   </Directory>
 

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

   <Files ~ "~$">
   <Files ~ "~$">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 </VirtualHost>
   </Files>
 </VirtualHost>