X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..a6b0ce09972cb11aa279a31b4bd28da96e0bc500:/cookbooks/osqa/templates/default/apache.erb?ds=inline

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index ad9850162..71ae69b7b 100644
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -9,6 +9,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         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>
 
@@ -16,16 +17,26 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         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
 
-        DocumentRoot <%= @directory %>
-        Alias /m/ <%= @directory %>/forum/skins/
-        Alias /upfiles/ <%= @directory %>/forum/upfiles/
+        DocumentRoot <%= @directory %>/osqa
+        Alias /m/ <%= @directory %>/osqa/forum/skins/
+        Alias /upfiles/ <%= @directory %>/upfiles/
         Alias /admin_media/ /usr/share/pyshared/django/contrib/admin/media/
-        WSGIScriptAlias / <%= @directory %>/osqa.wsgi
+        WSGIScriptAlias / <%= @directory %>/osqa/osqa.wsgi
 
         WSGIProcessGroup <%= @name %>
-
-        SSLEngine on
 </VirtualHost>
+
+<Directory <%= @directory %>/osqa>
+	Require all granted
+</Directory>
+
+<Directory <%= @directory %>/upfiles>
+	Require all granted
+</Directory>