From: Tom Hughes Date: Mon, 9 Sep 2013 11:28:05 +0000 (+0100) Subject: Enable SSSL in each virtual host X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b98a1b8f0ddc17ebf934add6fc310931d72805c8 Enable SSSL in each virtual host --- diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb index 6b12ce994..7e4007962 100644 --- a/cookbooks/mailman/templates/default/apache.erb +++ b/cookbooks/mailman/templates/default/apache.erb @@ -15,6 +15,8 @@ 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 diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb index ad9850162..5f739687e 100644 --- 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 + SSLEngine on + 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 %> - - SSLEngine on diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb index eb53ae7ec..255ed18dd 100644 --- 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 + SSLEngine on + 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 - - SSLEngine on