Enable SSSL in each virtual host

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 6b12ce994ec951c57608360d88b0ec4ce80bb8df..7e40079622a42616d8c6109ce2cd366e5aa95238 100644 (file)
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -15,6 +15,8 @@
        ServerAdmin postmaster@openstreetmap.org
        ServerSignature On
 
        ServerAdmin postmaster@openstreetmap.org
        ServerSignature On
 

+        SSLEngine on
+

        CustomLog /var/log/apache2/<%= @name %>-access.log combined
        ErrorLog /var/log/apache2/<%= @name %>-error.log
        LogLevel warn
        CustomLog /var/log/apache2/<%= @name %>-access.log combined
        ErrorLog /var/log/apache2/<%= @name %>-error.log
        LogLevel warn

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index ad98501626d0fa0654df814ed5af0d59f65b88f8..5f739687e13e1e1e0a43b1fd39d02ffd38315eac 100644 (file)
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -16,6 +16,8 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 

+        SSLEngine on
+

         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 


@@ -26,6 +28,4 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         WSGIScriptAlias / <%= @directory %>/osqa.wsgi
 
         WSGIProcessGroup <%= @name %>
         WSGIScriptAlias / <%= @directory %>/osqa.wsgi
 
         WSGIProcessGroup <%= @name %>

-
-        SSLEngine on

 </VirtualHost>
 </VirtualHost>

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index eb53ae7ecb3d0ec51dd4fb4b1e14abd5a728b97d..255ed18dd955f5c38a25327d3e69f497bea0096b 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -16,6 +16,8 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 

+        SSLEngine on
+

         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 


@@ -34,6 +36,4 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
                AuthExternal osm
                Require valid-user
        </Location>
                AuthExternal osm
                Require valid-user
        </Location>

-
-        SSLEngine on

 </VirtualHost>
 </VirtualHost>