X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2c06ac9ac5299064c209c63af2323b2c28186e3c..8ccf941a82940d016e9c68bdf0c29e190953c7f7:/cookbooks/forum/templates/default/apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index ad7a36d35..82942001b 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -13,7 +13,6 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-	ServerName forum.openstreetmap.org
 	ServerAlias forum.osm.org
 	ServerAdmin webmaster@openstreetmap.org
 
@@ -24,12 +23,24 @@
 	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>
+
+<VirtualHost *:443>
+	ServerName forum.openstreetmap.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
+
 	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
+	ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/\ndisable_functions=exec,shell_exec,system,passthru,popen,proc_open"
+	ProxyFCGISetEnvIf "true" PHP_VALUE "upload_max_filesize=70M\npost_max_size=100M"
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
@@ -42,5 +53,7 @@
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>
-	php_admin_flag engine off
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler None
+	</FilesMatch>
 </Directory>