X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7cd3afb93c1d0faa260130d3322a7d98e3b6cf01..990c5788c024aca6d5a8021ac90b42c0752fe71a:/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..4b3c844c8 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -8,7 +8,7 @@
 	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 / https://forum.openstreetmap.org/
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -16,13 +16,27 @@
 	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
 
 	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
+
+        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
+
+        Require all granted
+</Directory>
+
+<Directory /srv/forum.openstreetmap.org/html/img>
+        php_admin_flag engine off
+</Directory>