X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7cd3afb93c1d0faa260130d3322a7d98e3b6cf01..8ccf941a82940d016e9c68bdf0c29e190953c7f7:/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 0eea9db34..82942001b 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -8,7 +8,22 @@
 	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/
+	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>
 
 <VirtualHost *:443>
@@ -16,13 +31,29 @@
 	ServerAdmin webmaster@openstreetmap.org
 
 	SSLEngine on
-	SSLProtocol all -SSLv2
-	SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-	SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-	SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
+	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
+	DocumentRoot /srv/forum.openstreetmap.org/html
+
+	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>
+	RewriteEngine on
+	RewriteRule ^config\.php$ - [F,L]
+
+	Options -Indexes
+
+	Require all granted
+</Directory>
+
+<Directory /srv/forum.openstreetmap.org/html/img>
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler None
+	</FilesMatch>
+</Directory>