From 72dc9f953f57826a7ec8413081dd386dfc56a0dc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 24 Feb 2015 14:24:23 +0000 Subject: [PATCH] Add https support for git.openstreetmap.org --- cookbooks/git/recipes/web.rb | 2 +- cookbooks/git/templates/default/apache.erb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb index 74e722a0c..ef116d4e0 100644 --- 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 be5cbab6e..e9bebd2ea 100644 --- a/cookbooks/git/templates/default/apache.erb +++ b/cookbooks/git/templates/default/apache.erb @@ -2,6 +2,19 @@ ServerName <%= @name %> + ServerAdmin webmaster@openstreetmap.org + + CustomLog /var/log/apache2/<%= @name %>-access.log combined + ErrorLog /var/log/apache2/<%= @name %>-error.log + + RedirectPermanent / https://<%= @name %>/ + + + + ServerName <%= @name %> + ServerAdmin webmaster@openstreetmap.org + + SSLEngine on CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log -- 2.43.2