apache: use new combined_extended log format instead of combined

diff --git a/cookbooks/blogs/templates/default/apache.erb b/cookbooks/blogs/templates/default/apache.erb
index 507d48b1968184c207b9a75a3c2cac91490f2e16..e2ae4cf3efb254545ec3eeab11f48c2cfd12d970 100644 (file)
--- a/cookbooks/blogs/templates/default/apache.erb
+++ b/cookbooks/blogs/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 %>/


@@ -41,7 +41,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
 
   DocumentRoot <%= @directory %>
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   DocumentRoot <%= @directory %>

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 9d86d910e7c858b4ccdfdd3b9e71391e8c8a7705..917759a7cb4b1d2823b27460e643ebb7874e7a04 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -5,7 +5,7 @@
        ServerAlias chef.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerAlias chef.osm.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/


@@ -16,7 +16,7 @@
        ServerName chef.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName chef.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        SSLEngine on
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        SSLEngine on

diff --git a/cookbooks/civicrm/templates/default/apache.erb b/cookbooks/civicrm/templates/default/apache.erb
index fdd0b47feab2e20113a0117a792b0981e521c220..7f45c976d3e921d51bbb2899fd8d506034e9df6f 100644 (file)
--- a/cookbooks/civicrm/templates/default/apache.erb
+++ b/cookbooks/civicrm/templates/default/apache.erb
@@ -26,7 +26,7 @@
 
   RewriteRule ^/(.*)$ https://supporting.openstreetmap.org/$1 [R=307,L]
 
 
   RewriteRule ^/(.*)$ https://supporting.openstreetmap.org/$1 [R=307,L]
 

-  CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined
+  CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined_extended

   ErrorLog /var/log/apache2/join.osmfoundation.org-error.log
 
 </VirtualHost>
   ErrorLog /var/log/apache2/join.osmfoundation.org-error.log
 
 </VirtualHost>

diff --git a/cookbooks/dev/templates/default/apache.apis.erb b/cookbooks/dev/templates/default/apache.apis.erb
index c1eddbdb2b1e83924d95c986a9069a82e786163b..4d78fdd6aa864e0504ae9172bfc60ff40fff4843 100644 (file)
--- a/cookbooks/dev/templates/default/apache.apis.erb
+++ b/cookbooks/dev/templates/default/apache.apis.erb
@@ -8,7 +8,7 @@
        SSLCertificateFile /etc/ssl/certs/apis.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/apis.dev.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/apis.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/apis.dev.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
 
        DocumentRoot /srv/apis.dev.openstreetmap.org
        ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
 
        DocumentRoot /srv/apis.dev.openstreetmap.org


@@ -18,7 +18,7 @@
        ServerName apis.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName apis.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

diff --git a/cookbooks/dev/templates/default/apache.dev.erb b/cookbooks/dev/templates/default/apache.dev.erb
index 71b73b976bc45f2154eb993664d8dd9f1551186d..2d3d9473d27e99858d4d0cb9bf68784db286c68e 100644 (file)
--- a/cookbooks/dev/templates/default/apache.dev.erb
+++ b/cookbooks/dev/templates/default/apache.dev.erb
@@ -8,7 +8,7 @@
        SSLCertificateFile /etc/ssl/certs/dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/dev.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/dev.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log
 
        DocumentRoot /srv/dev.openstreetmap.org
        ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log
 
        DocumentRoot /srv/dev.openstreetmap.org


@@ -23,7 +23,7 @@
        ServerName dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

diff --git a/cookbooks/dev/templates/default/apache.ooc.erb b/cookbooks/dev/templates/default/apache.ooc.erb
index 6b921e830b241a86d2c326b8f1c62fd7eb8fde08..0a9b0b9799484e8cd74dde9d926fecff40c21fc9 100644 (file)
--- a/cookbooks/dev/templates/default/apache.ooc.erb
+++ b/cookbooks/dev/templates/default/apache.ooc.erb
@@ -11,7 +11,7 @@
        SSLCertificateFile /etc/ssl/certs/ooc.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/ooc.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/ooc.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/ooc.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log
 
        DocumentRoot /srv/ooc.openstreetmap.org/html
        ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log
 
        DocumentRoot /srv/ooc.openstreetmap.org/html


@@ -28,7 +28,7 @@
        ServerAlias c.ooc.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerAlias c.ooc.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/


@@ -39,7 +39,7 @@
        ServerName npe.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName npe.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/npe.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/npe.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/npe.openstreetmap.org-error.log
 
        RewriteEngine on
        ErrorLog /var/log/apache2/npe.openstreetmap.org-error.log
 
        RewriteEngine on

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index fba25578118e04fdb318f9d23370bcc13f8b40dd..546a05cbee3c45605f9f42cc9620943252c4ec5d 100644 (file)
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -8,7 +8,7 @@
        SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        DocumentRoot /usr/share/phppgadmin
        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        DocumentRoot /usr/share/phppgadmin


@@ -25,7 +25,7 @@
        ServerName phppgadmin.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName phppgadmin.dev.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb
index 18b0d77a06800e95df8bd5c4373f2e728e45bb2c..957866c5c482473e12a185a378d3567a38fe6137 100644 (file)
--- a/cookbooks/dev/templates/default/apache.rails.erb
+++ b/cookbooks/dev/templates/default/apache.rails.erb
@@ -11,7 +11,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
 
         DocumentRoot /srv/<%= @name %>/rails/public
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         DocumentRoot /srv/<%= @name %>/rails/public


@@ -60,7 +60,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/

diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index fb03b648705d1b02cb69a7fefd1f7e2b05056be3..373d12258faef19fd427c44d5d66f331092e54ad 100644 (file)
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -23,7 +23,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes
        RewriteEngine on
        #LogLevel rewrite:trace2
 
        RewriteEngine on
        #LogLevel rewrite:trace2
 

-       CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f


@@ -39,7 +39,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes
        ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 
        ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 

-       CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended

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

diff --git a/cookbooks/dns/templates/default/apache.erb b/cookbooks/dns/templates/default/apache.erb
index 0021d3e8205b763b4796f74f553884de517a328c..210f234fe5ad7b7570f643814008f5cf1ae02d34 100644 (file)
--- a/cookbooks/dns/templates/default/apache.erb
+++ b/cookbooks/dns/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 %>/


@@ -41,7 +41,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
 
   DocumentRoot <%= @directory %>/html
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   DocumentRoot <%= @directory %>/html

diff --git a/cookbooks/exim/templates/default/apache-mta-sts.erb b/cookbooks/exim/templates/default/apache-mta-sts.erb
index 82b787fabf727e69893f1d61a1e6734eefaf6554..da7ccddbaa5c6f0485f132b0eae12f165b65069e 100644 (file)
--- a/cookbooks/exim/templates/default/apache-mta-sts.erb
+++ b/cookbooks/exim/templates/default/apache-mta-sts.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/


@@ -22,7 +22,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
 
   Alias /.well-known/mta-sts.txt <%= @directory %>/<%= domain %>.txt
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   Alias /.well-known/mta-sts.txt <%= @directory %>/<%= domain %>.txt

diff --git a/cookbooks/exim/templates/default/apache.erb b/cookbooks/exim/templates/default/apache.erb
index f7a5c8ada7a72a4b4063ade86d5edc72538d02bf..505a63a4d3cbad6a3ffd9acf5fb4dddde216d087 100644 (file)
--- a/cookbooks/exim/templates/default/apache.erb
+++ b/cookbooks/exim/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 %>/


@@ -41,6 +41,6 @@
   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
 </VirtualHost>
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 </VirtualHost>

diff --git a/cookbooks/gps-tile/templates/default/apache.erb b/cookbooks/gps-tile/templates/default/apache.erb
index adc7a061d049c3d1bb82283aa293359677ec94dd..9adf707ddd8cd0325062e79b4b92c873e5fd8782 100644 (file)
--- a/cookbooks/gps-tile/templates/default/apache.erb
+++ b/cookbooks/gps-tile/templates/default/apache.erb
@@ -23,7 +23,7 @@
   RedirectPermanent /gps-lines/tile /lines
 
   # Setup logging
   RedirectPermanent /gps-lines/tile /lines
 
   # Setup logging

-  CustomLog /var/log/apache2/access.log combined
+  CustomLog /var/log/apache2/access.log combined_extended

   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 


@@ -50,7 +50,7 @@
   RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L]
 
   # Setup logging
   RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L]
 
   # Setup logging

-  CustomLog /var/log/apache2/access.log combined
+  CustomLog /var/log/apache2/access.log combined_extended

   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 </VirtualHost>
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 </VirtualHost>

diff --git a/cookbooks/kibana/templates/default/apache.erb b/cookbooks/kibana/templates/default/apache.erb
index 0691d8a315cfdc13ef1ac9984e4512a8159dfc6b..2121eeda206fed599ae7e6fcc84bd65127f3b76f 100644 (file)
--- a/cookbooks/kibana/templates/default/apache.erb
+++ b/cookbooks/kibana/templates/default/apache.erb
@@ -4,7 +4,7 @@
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 

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

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


@@ -15,7 +15,7 @@
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 

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

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

diff --git a/cookbooks/letsencrypt/templates/default/apache.erb b/cookbooks/letsencrypt/templates/default/apache.erb
index c49079daed731ddf0ae128af1d2213a007e667ef..37d1df5283de05c1d0b72d280cd975e7bc6d77b6 100644 (file)
--- a/cookbooks/letsencrypt/templates/default/apache.erb
+++ b/cookbooks/letsencrypt/templates/default/apache.erb
@@ -5,7 +5,7 @@
         ServerAlias acme.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias acme.osm.org
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined
+        CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined_extended

         ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log
 
         DocumentRoot /srv/acme.openstreetmap.org/html
         ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log
 
         DocumentRoot /srv/acme.openstreetmap.org/html


@@ -16,7 +16,7 @@
         ServerAlias acme.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias acme.osm.org
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined
+        CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined_extended

         ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log
 
         SSLEngine on
         ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log
 
         SSLEngine on

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 7b4037c48cbcf734c1efb2f75885a2639dff338d..6ad616686f9e2455e52c5db3d32362ea1531a921 100644 (file)
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -7,7 +7,7 @@
 <% end -%>
   ServerAdmin postmaster@openstreetmap.org
 
 <% end -%>
   ServerAdmin postmaster@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 %>/


@@ -42,7 +42,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
   LogLevel warn
 
   ErrorLog /var/log/apache2/<%= @name %>-error.log
   LogLevel warn
 

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 5fd21d6023b375807d8b32cf4f28f82dac6903a8..525d1fbccb83fd669fa49c20613dd0f13b1293f8 100644 (file)
--- a/cookbooks/matomo/templates/default/apache.erb
+++ b/cookbooks/matomo/templates/default/apache.erb
@@ -8,7 +8,7 @@
        SSLCertificateFile /etc/ssl/certs/matomo.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/matomo.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/matomo.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/matomo.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        Options -Indexes
        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        Options -Indexes


@@ -31,7 +31,7 @@
        SSLCertificateFile /etc/ssl/certs/matomo.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/matomo.openstreetmap.org.key
 
        SSLCertificateFile /etc/ssl/certs/matomo.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/matomo.openstreetmap.org.key
 

-       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        RedirectPermanent / https://matomo.openstreetmap.org/
        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        RedirectPermanent / https://matomo.openstreetmap.org/


@@ -44,7 +44,7 @@
        ServerAlias piwik.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerAlias piwik.osm.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index a62b4813c1d54a8c5fd2470cd2e4b8bfe9ee5ee4..375e09c3df8ce4699f9befc078f444ea7b195a26 100644 (file)
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -9,7 +9,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
 <% 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/


@@ -28,7 +28,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
   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 %>/


@@ -43,7 +43,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
   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
 
   DocumentRoot <%= @directory %>/osqa
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   DocumentRoot <%= @directory %>/osqa

diff --git a/cookbooks/otrs/templates/default/apache.erb b/cookbooks/otrs/templates/default/apache.erb
index 0a8735c5016d3faee5448f53f0bdce20b449bd73..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

diff --git a/cookbooks/overpass/templates/default/apache.erb b/cookbooks/overpass/templates/default/apache.erb
index 8ccd28a9d3eae34cfe2e2eabcca8614a03073144..007e1c287d6b1ac58c7cef558ef3f9844611c099 100644 (file)
--- a/cookbooks/overpass/templates/default/apache.erb
+++ b/cookbooks/overpass/templates/default/apache.erb
@@ -5,7 +5,7 @@
         ServerAlias <%= node[:overpass][:fqdn] %>
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias <%= node[:overpass][:fqdn] %>
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined
+        CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined_extended

         ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log
 
         DocumentRoot <%= @directory %>
         ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log
 
         DocumentRoot <%= @directory %>


@@ -20,7 +20,7 @@
         ServerAlias <%= node[:overpass][:fqdn] %>
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias <%= node[:overpass][:fqdn] %>
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined
+        CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined_extended

         ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log
 
         SSLEngine on
         ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log
 
         SSLEngine on

diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index 347b32aa0b9e8760f2796049813416ad83e55e42..867d1c6fec29bba65366e5059910d7d0dfad22b4 100644 (file)
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -5,7 +5,7 @@
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined_extended

         ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
         SSLEngine on
         ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
         SSLEngine on


@@ -93,7 +93,7 @@
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 
         ServerAlias planet.osm.org
         ServerAdmin webmaster@openstreetmap.org
 

-        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined
+        CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined_extended

         ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
         RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
         ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log
 
         RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

diff --git a/cookbooks/podman/templates/default/apache.erb b/cookbooks/podman/templates/default/apache.erb
index 3c1f510c2ca5692e8fa92a25ceba9daf4e510d35..92ca2f4c5537ca44bd9a37ab7b604cc0275557d4 100644 (file)
--- a/cookbooks/podman/templates/default/apache.erb
+++ b/cookbooks/podman/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/


@@ -22,7 +22,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
 
   SSLEngine on
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   SSLEngine on


@@ -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

diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb
index fe910eb1860f43e3d3367d8f77d6537a0187333e..af005314002b5ba7a96bc934850241f2ebb0c973 100644 (file)
--- a/cookbooks/prometheus/templates/default/apache.erb
+++ b/cookbooks/prometheus/templates/default/apache.erb
@@ -5,7 +5,7 @@
        ServerAlias prometheus.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerAlias prometheus.osm.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/


@@ -16,7 +16,7 @@
        ServerName prometheus.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName prometheus.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        SSLEngine on
        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        SSLEngine on

diff --git a/cookbooks/serverinfo/templates/default/apache.erb b/cookbooks/serverinfo/templates/default/apache.erb
index 309f59550aaee9fb562264e2e9144c3678485665..3f4416aa06bb703642187b6258a02300268ef190 100644 (file)
--- a/cookbooks/serverinfo/templates/default/apache.erb
+++ b/cookbooks/serverinfo/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

diff --git a/cookbooks/taginfo/templates/default/apache.erb b/cookbooks/taginfo/templates/default/apache.erb
index 4965a9bc131b433218f92a7c4608c0734ba516ee..6d7dd08b48f9a08af8852f89a1118c94c24e48c5 100644 (file)
--- a/cookbooks/taginfo/templates/default/apache.erb
+++ b/cookbooks/taginfo/templates/default/apache.erb
@@ -8,7 +8,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
 
         DocumentRoot <%= @directory %>
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         DocumentRoot <%= @directory %>


@@ -38,7 +38,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 %>/


@@ -52,7 +52,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/