X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b98a1b8f0ddc17ebf934add6fc310931d72805c8..8537492026e315644bea0b5947924f29a51ebe4c:/cookbooks/trac/templates/default/apache.erb

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index 255ed18dd..ad9429bb1 100644
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -9,6 +9,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
         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>
 
@@ -17,6 +18,8 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
         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
@@ -37,3 +40,11 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
 		Require valid-user
 	</Location>
 </VirtualHost>
+
+<Directory <%= @directory %>/htdocs>
+	Require all granted
+</Directory>
+
+<Directory <%= @directory %>/cgi-bin>
+	Require all granted
+</Directory>