Update ssh keys for tomh

[chef.git] / cookbooks / osqa / templates / default / apache.erb

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>