X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..55fc22bb3b3c7adfd60c2c4865e52d71c7de3572:/cookbooks/git/templates/default/apache.erb

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index e9cb8b701..21e0aa077 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -2,6 +2,22 @@
 
 <VirtualHost *:80>
 	ServerName <%= @name %>
+	ServerAdmin webmaster@openstreetmap.org
+
+	CustomLog /var/log/apache2/<%= @name %>-access.log combined
+	ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+	RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+	ServerName <%= @name %>
+	ServerAdmin webmaster@openstreetmap.org
+
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+	SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
 	CustomLog /var/log/apache2/<%= @name %>-access.log combined
 	ErrorLog /var/log/apache2/<%= @name %>-error.log
@@ -16,3 +32,7 @@
 	RewriteRule ^/$ /gitweb.cgi%{REQUEST_URI} [L,PT]
 	RewriteRule ^/(.*\.git/(?!/?(HEAD|info|objects|refs)).*)?$ /gitweb.cgi%{REQUEST_URI} [L,PT]
 </VirtualHost>
+
+<Directory <%= @directory %>>
+	Require all granted
+</Directory>