Commit 821c4ac3 authored by Andrew Ladlow's avatar Andrew Ladlow

Merge branch 'jessie_backported_logger_fix' into 'jessie'

Backported fix for symbiosis-httpd-logger

See merge request open-source/symbiosis!104
parents 049694c4 abcb1ac5
Pipeline #49 failed with stages
in 2 minutes and 3 seconds
......@@ -63,7 +63,7 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/access.log" combined
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/access.log" combined
</VirtualHost>
......@@ -102,8 +102,8 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/ssl_error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/ssl_access.log" combined
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/ssl_error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/ssl_access.log" combined
</VirtualHost>
<VirtualHost <%= ips.collect{|ip| ip+":80"}.join(" ") %>>
......@@ -175,8 +175,8 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -s -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/access.log" combined
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -u <%= domain.uid %> -g <%= domain.gid %> <%= domain.log_dir %>/access.log" combined
% end
</VirtualHost>
......
......@@ -122,7 +122,7 @@
# statistics for each domain.
#
LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -s -l ssl_access.log ${APACHE_LOG_DIR}/zz-mass-hosting.ssl_access.log" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -l ssl_access.log ${APACHE_LOG_DIR}/zz-mass-hosting.ssl_access.log" zz_mass_hosting_combined
ErrorLog ${APACHE_LOG_DIR}/zz-mass-hosting.error.log
</VirtualHost>
......@@ -89,7 +89,7 @@
# statistics for each domain.
#
LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -s -l access.log ${APACHE_LOG_DIR}/zz-mass-hosting.access.log" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -l access.log ${APACHE_LOG_DIR}/zz-mass-hosting.access.log" zz_mass_hosting_combined
ErrorLog ${APACHE_LOG_DIR}/zz-mass-hosting.error.log
</VirtualHost>
......
symbiosis-httpd (2015:1114) stable; urgency=medium
* Backported performance fix from Stretch build in the event that the optional
symbiosis-httpd-logger package is installed.
-- Paul Cammish <paul.cammish@bytemark.co.uk> Thu, 09 Aug 2018 15:13:21 +0100
symbiosis-httpd (2015:1113) stable; urgency=medium
* Removed symbiosis-common as a build-dep.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment