Move forum PHP configuration options to FPM configuration

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

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index 4b3c844c82cc79c29069356182773a5d60d4bfcb..9150356596f1620419c09665ed42a46800800115 100644 (file)
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -8,6 +8,21 @@
        CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
+       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+       RedirectPermanent / https://forum.openstreetmap.org/
+</VirtualHost>
+
+<VirtualHost *:443>
+       ServerAlias forum.osm.org
+       ServerAdmin webmaster@openstreetmap.org
+
+       SSLEngine on
+       SSLCertificateFile /etc/ssl/certs/forum.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/forum.openstreetmap.org.key
+
+       CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
+       ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
+
        RedirectPermanent / https://forum.openstreetmap.org/
 </VirtualHost>
 
@@ -16,27 +31,20 @@
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
+       SSLCertificateFile /etc/ssl/certs/forum.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/forum.openstreetmap.org.key
 
        CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
        DocumentRoot /srv/forum.openstreetmap.org/html
-
-        php_admin_value open_basedir /srv/forum.openstreetmap.org/html/:/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
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
-        RewriteEngine on
-        RewriteRule ^config\.php$ - [F,L]
-
-        Options -Indexes
+       RewriteEngine on
+       RewriteRule ^config\.php$ - [F,L]
 
-        Require all granted
-</Directory>
+       Options -Indexes
 
-<Directory /srv/forum.openstreetmap.org/html/img>
-        php_admin_flag engine off
+       Require all granted
 </Directory>