X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ce6272139752d152c4647a478b700d255e1a3df6..a661370166bbac0bbe8c8b1f0ba947e3a269edee:/cookbooks/git/templates/default/apache.erb

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 @@
 
 <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