put pummelzacken back into update mode

[chef.git] / cookbooks / otrs / templates / default / apache.erb

diff --git a/cookbooks/otrs/templates/default/apache.erb b/cookbooks/otrs/templates/default/apache.erb
index da5a60d2f94d520016e556a2ff78f560fa3e6ccd..e392d87652d6346a23175dc26dbf0e732b2c7605 100644 (file)
--- a/cookbooks/otrs/templates/default/apache.erb
+++ b/cookbooks/otrs/templates/default/apache.erb
@@ -7,6 +7,7 @@
         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://otrs.openstreetmap.org/
 </VirtualHost>
 
@@ -18,6 +19,8 @@
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         SSLEngine on
+        SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+        SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
         ScriptAlias /otrs/ /opt/otrs/bin/cgi-bin/
         Alias /otrs-web/ /opt/otrs/var/httpd/htdocs/
@@ -37,8 +40,7 @@
                 Options +ExecCGI
                 PerlOptions +ParseHeaders
                 PerlOptions +SetupEnv
-                Order allow,deny
-                Allow from all
+                Require all granted
         </Location>
 
         <Location /otrs/nph-genericinterface.pl>
@@ -49,14 +51,12 @@
 <Directory /opt/otrs/bin/cgi-bin>
         AllowOverride None
         Options +ExecCGI -Includes
-        Order allow,deny
-        Allow from all
+        Require all granted
 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs>
         AllowOverride None
-        Order allow,deny
-        Allow from all
+        Require all granted
 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs/skins/*/*/css-cache>