palulukon: Allow access to AWS IP metadata NTP service

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

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 5b503cae630e0bceb5f15fc85e4973d99d2968a4..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/


@@ -83,6 +83,6 @@
        </FilesMatch>
 
         <FilesMatch ".+\.ph(ar|p|tml)$">
        </FilesMatch>
 
         <FilesMatch ".+\.ph(ar|p|tml)$">

-                SetHandler "proxy:unix:/run/php/matomo.openstreetmap.org.sock|fcgi://127.0.0.1"
+                SetHandler "proxy:unix:/run/php/php-matomo.openstreetmap.org-fpm.sock|fcgi://127.0.0.1"

         </FilesMatch>
 </Directory>
         </FilesMatch>
 </Directory>