Add https support for git.openstreetmap.org

diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index 74e722a0c645a7d49c5515d1ecb8cdc238f39706..ef116d4e0e0b2062109576668888d2027b386178 100644 (file)
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "gitweb"
 

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index be5cbab6ea0ac38907b1b5d23f40f63fe2e3a948..e9bebd2ea46002511e1bc6e51c7c7a741f0ba348 100644 (file)
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -2,6 +2,19 @@
 
 <VirtualHost *:80>
        ServerName <%= @name %>
+       ServerAdmin webmaster@openstreetmap.org
+
+       CustomLog /var/log/apache2/<%= @name %>-access.log combined
+       ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+       RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+       ServerName <%= @name %>
+       ServerAdmin webmaster@openstreetmap.org
+
+       SSLEngine on
 
        CustomLog /var/log/apache2/<%= @name %>-access.log combined
        ErrorLog /var/log/apache2/<%= @name %>-error.log