Ignore errors killing processes which may have already exited

[chef.git] / cookbooks / web / templates / default / apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 206d54c07f63adf14968e5154c6a2d51f8916b73..7f34564c02096c35bea9eb14e7b6c42b79e9c42d 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -14,6 +14,7 @@
   # Enable SSL
   #
   SSLEngine on
   # Enable SSL
   #
   SSLEngine on

+  SSLProxyEngine on

 <% end -%>
 
   #
 <% end -%>
 
   #


@@ -191,9 +192,15 @@
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness

+<% if port == 443 -%>
+    BalancerMember https://rails1
+    BalancerMember https://rails2
+    BalancerMember https://rails3
+<% else -%>

     BalancerMember http://rails1
     BalancerMember http://rails2
     BalancerMember http://rails3
     BalancerMember http://rails1
     BalancerMember http://rails2
     BalancerMember http://rails3

+<% end -%>

   </Proxy>
 <% if port == 80 -%>
 
   </Proxy>
 <% if port == 80 -%>
 


@@ -222,12 +229,6 @@
   RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
 <% elsif port == 443 -%>
 
   RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
 <% elsif port == 443 -%>
 

-  #
-  # Redirect requests which don't work over https to http
-  #
-  RewriteCond %{REQUEST_URI} ^/edit$
-  RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
-

   #
   # Redirect api requests made to www.osm.org to api.osm.org
   #
   #
   # Redirect api requests made to www.osm.org to api.osm.org
   #


@@ -282,6 +283,15 @@
   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>
 
   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>
 

+<VirtualHost *:443>
+  ServerName openstreetmap.org
+  ServerAlias maps.openstreetmap.org mapz.openstreetmap.org
+
+  SSLEngine on
+
+  RedirectPermanent / https://www.openstreetmap.org/
+</VirtualHost>
+

 <VirtualHost *:80>
   ServerName openstreetmap.org.uk
   ServerAlias www.openstreetmap.org.uk
 <VirtualHost *:80>
   ServerName openstreetmap.org.uk
   ServerAlias www.openstreetmap.org.uk