X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/49e98834e8e1dfd6961546a2aa73283fb66a7e59..2a9e93bd39ad46954630a0d1e43566e7ccb2aa81:/cookbooks/forum/templates/default/apache.erb?ds=sidebyside

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index d84b01967..5235ee1f8 100644
--- 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,24 +31,30 @@
 	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
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler "proxy:unix:/run/php/php-forum.openstreetmap.org-fpm.sock|fcgi://127.0.0.1"
+	</FilesMatch>
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
-           RewriteEngine on
+	RewriteEngine on
+	RewriteRule ^config\.php$ - [F,L]
+
+	Options -Indexes
 
-           RewriteRule ^config\.php$ - [F,L]
+	Require all granted
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>
-        php_admin_flag engine off
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler None
+	</FilesMatch>
 </Directory>