imagery: za fix NGI url

[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 4018c36a187510795edee0f326f943ec4130f30d..a3605a966d968e2509189b7d4222c995ecedd79b 100644 (file)
--- a/cookbooks/otrs/templates/default/apache.erb
+++ b/cookbooks/otrs/templates/default/apache.erb
@@ -7,7 +7,7 @@
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 

-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended

   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/


@@ -26,7 +26,7 @@
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 

-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended

   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent / https://<%= @name %>/
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent / https://<%= @name %>/


@@ -37,7 +37,7 @@
   ServerName <%= @name %>
   ServerAdmin webmaster@openstreetmap.org
 
   ServerName <%= @name %>
   ServerAdmin webmaster@openstreetmap.org
 

-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended

   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   SSLEngine on
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   SSLEngine on


@@ -70,25 +70,25 @@
   </Location>
 </VirtualHost>
 
   </Location>
 </VirtualHost>
 

-  <Directory /opt/otrs/bin/cgi-bin>
-    AllowOverride None
-    Options +ExecCGI -Includes
-    Require all granted
-  </Directory>
+<Directory /opt/otrs/bin/cgi-bin>
+  AllowOverride None
+  Options +ExecCGI -Includes
+  Require all granted
+</Directory>

 
 

-  <Directory /opt/otrs/var/httpd/htdocs>
-    AllowOverride None
-    Require all granted
-  </Directory>
-
-  <Directory /opt/otrs/var/httpd/htdocs/skins/*/*/css-cache>
-    <FilesMatch "\.(css|CSS)$">
-      Header set Cache-Control "max-age=2592000 must-revalidate"
-    </FilesMatch>
-  </Directory>
-
-  <Directory /opt/otrs/var/httpd/htdocs/js/js-cache>
-    <FilesMatch "\.(js|JS)$">
-      Header set Cache-Control "max-age=2592000 must-revalidate"
-    </FilesMatch>
+<Directory /opt/otrs/var/httpd/htdocs>
+  AllowOverride None
+  Require all granted
+</Directory>
+
+<Directory /opt/otrs/var/httpd/htdocs/skins/*/*/css-cache>
+  <FilesMatch "\.(css|CSS)$">
+    Header set Cache-Control "max-age=2592000 must-revalidate"
+  </FilesMatch>
+</Directory>
+
+<Directory /opt/otrs/var/httpd/htdocs/js/js-cache>
+  <FilesMatch "\.(js|JS)$">
+    Header set Cache-Control "max-age=2592000 must-revalidate"
+  </FilesMatch>

 </Directory>
 </Directory>