Remove hp-g5 role from thorn-0[123]

[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 0eea9db34beaa007ec453b726ad270ac53612674..4b3c844c82cc79c29069356182773a5d60d4bfcb 100644 (file)
--- 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
 
        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>
 </VirtualHost>
 
 <VirtualHost *:443>


@@ -16,13 +16,27 @@
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
        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
 
 
        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>
 </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>