Add logrotate where required

[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 3695fc2b7ead29c975a23ad467dfe9447883f60b..b15ec55d91c3e9edf684d7b968ba80ff4afc435d 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -8,40 +8,57 @@
 
   ServerAdmin webmaster@openstreetmap.org
 
 
   ServerAdmin webmaster@openstreetmap.org
 

-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended

   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   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>
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>

+<% unless @aliases.empty? -%>

 
 <VirtualHost *:443>
 
 <VirtualHost *:443>

-  ServerName <%= @name %>
-<% @aliases.each do |alias_name| -%>
+  ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>

   ServerAlias <%= alias_name %>
 <% end -%>
 
   ServerAdmin webmaster@openstreetmap.org
 
   ServerAlias <%= alias_name %>
 <% end -%>
 
   ServerAdmin webmaster@openstreetmap.org
 

-  #
-  # Enable SSL
-  #

   SSLEngine on
   SSLEngine on

+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key

 
 

-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended

   ErrorLog /var/log/apache2/<%= @name %>-error.log
   ErrorLog /var/log/apache2/<%= @name %>-error.log

+
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>

 <% end -%>
 
 <% end -%>
 

+<VirtualHost *:443>
+  ServerName <%= @name %>
+
+  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_extended
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+

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

+  <Directory <%= directory %>>
+    AllowOverride None
+    Require all granted
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler None
+    </FilesMatch>
+  </Directory>

 <% end -%>
 
 <% end -%>
 

-  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
-  php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
-  php_value upload_max_filesize 70M
-  php_value post_max_size 100M
-

   <Directory <%= @directory %>>
     RewriteEngine on
 
   <Directory <%= @directory %>>
     RewriteEngine on
 


@@ -50,13 +67,23 @@
     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]
+    RewriteRule ^index\.php$ - [L]

     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
 
     Options -Indexes
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
 
     Options -Indexes

+    AllowOverride AuthConfig

 
     Require all granted
 
     Require all granted

+
+    # https://www.wp-pay.org/http-authorization-header-missing/
+    CGIPassAuth on
+
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1"
+    </FilesMatch>

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


@@ -66,7 +93,9 @@
   <Directory <%= @directory %>/uploads>
     AllowOverride None
     AddType text/plain .html .htm .shtml
   <Directory <%= @directory %>/uploads>
     AllowOverride None
     AddType text/plain .html .htm .shtml

-    php_admin_flag engine off
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler None
+    </FilesMatch>

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


@@ -77,7 +106,15 @@
     Require all denied
   </Directory>
 
     Require all denied
   </Directory>
 

+  <Files ~ "(?<!robots|ads|security|humans)\.(txt|md)$">
+    Require all denied
+  </Files>
+

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

+
+  <Files "xmlrpc.php">
+    Require all denied
+  </Files>

 </VirtualHost>
 </VirtualHost>