X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93088ecf5f09c8d7383fccd4aa06fcf44cb4691a..229bfd4d1ef647515f13b6e8e064a957881f2ca7:/cookbooks/wordpress/templates/default/apache.erb

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 90adc23a2..3d0b97ade 100644
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,25 +11,29 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-
 <% if @ssl_enabled -%>
-    RedirectPermanent / https://<%= @name %>/
-  </VirtualHost>
-  <VirtualHost *:443>
-    ServerName <%= @name %>
-  <% @aliases.each do |alias_name| -%>
-    ServerAlias <%= alias_name %>
-  <% end -%>
-
-    ServerAdmin webmaster@openstreetmap.org
-
-    #
-    # Enable SSL
-    #
-    SSLEngine on
-
-    CustomLog /var/log/apache2/<%= @name %>-access.log combined
-    ErrorLog /var/log/apache2/<%= @name %>-error.log
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+  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 -%>
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 <% end -%>
 
   DocumentRoot <%= @directory %>
@@ -53,12 +57,15 @@
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
+
     Options -Indexes
+    AllowOverride AuthConfig
+
+    Require all granted
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 
   <Directory <%= @directory %>/uploads>
@@ -68,17 +75,14 @@
   </Directory>
 
   <Directory ~ "\.svn">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Directory ~ "\.git">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files ~ "~$">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 </VirtualHost>