Use strings for file modes

[chef.git] / cookbooks / dev / templates / default / apache.user.erb

diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index f31ed4f61ef7dd40659cadc13d7237c638230abc..a6d4d8866402de0405897b2048174113ab6a783a 100644 (file)
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -2,11 +2,18 @@
 
 WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivity-timeout=600
 
 
 WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivity-timeout=600
 

-<VirtualHost *:80>
+<VirtualHost *:443>

        ServerName <%= @user %>.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 
        ServerName <%= @user %>.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 

+       SSLEngine on
+       SSLCertificateFile /etc/ssl/certs/<%= @user %>.dev.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/<%= @user %>.dev.openstreetmap.org.key
+
+       # Remove Proxy request header to mitigate https://httpoxy.org/
+       RequestHeader unset Proxy early
+

        UseCanonicalName Off
        DocumentRoot <%= @directory %>
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
        UseCanonicalName Off
        DocumentRoot <%= @directory %>
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/


@@ -14,19 +21,28 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
        WSGIProcessGroup <%= @user %>.dev.openstreetmap.org
 
        RewriteEngine on
        WSGIProcessGroup <%= @user %>.dev.openstreetmap.org
 
        RewriteEngine on

-       #RewriteLog /var/log/apache2/rewrite.log
-       #RewriteLogLevel 4
+       #LogLevel rewrite:trace2

 
        CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
 
        CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f

-       RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L]
+       RewriteRule ^/cgi-bin/(.*)$ /~<%= @user %>/cgi-bin/$1 [PT,L]

 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f

-       RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L]
+       RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]
+</VirtualHost>
+
+<VirtualHost *:80>
+       ServerName <%= @user %>.dev.openstreetmap.org
+       ServerAdmin webmaster@openstreetmap.org
+       ServerAlias <%= @user %>.dev.osm.org
+
+       CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
+       ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log

 
 

-       ProxyPassMatch ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1
+       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+       RedirectPermanent / https://<%= @user %>.dev.openstreetmap.org/

 </VirtualHost>
 
 <Directory <%= @directory %>>
 </VirtualHost>
 
 <Directory <%= @directory %>>


@@ -35,6 +51,12 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
        Require all granted
 </Directory>
 
        Require all granted
 </Directory>
 

+<Directory <%= @directory %>/cgi-bin>
+       SetHandler cgi-script
+       Options ExecCGI SymLinksIfOwnerMatch
+       Require all granted
+</Directory>
+

 <Directory <%= @directory %>/wsgi-bin>
        SetHandler wsgi-script
        Options ExecCGI SymLinksIfOwnerMatch
 <Directory <%= @directory %>/wsgi-bin>
        SetHandler wsgi-script
        Options ExecCGI SymLinksIfOwnerMatch