diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf index cdef75682..d5f525a0e 100644 --- a/config/etc/syslog.conf +++ b/config/etc/syslog.conf @@ -21,3 +21,6 @@ cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* -/var/log/messa # Postfix logs mail.* -/var/log/mail + +# HAProxy +local1.* -/var/log/haproxy diff --git a/config/haproxy/logrotate b/config/haproxy/logrotate new file mode 100644 index 000000000..aa02505ee --- /dev/null +++ b/config/haproxy/logrotate @@ -0,0 +1,8 @@ +/var/log/haproxy { + missingok + notifempty + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + endscript +} diff --git a/config/rootfiles/packages/haproxy b/config/rootfiles/packages/haproxy index 515145d58..7677ba4ad 100644 --- a/config/rootfiles/packages/haproxy +++ b/config/rootfiles/packages/haproxy @@ -1,5 +1,6 @@ #etc/haproxy etc/haproxy/haproxy.cfg +etc/logrotate.d/haproxy etc/rc.d/init.d/haproxy usr/sbin/haproxy #usr/sbin/haproxy-systemd-wrapper diff --git a/lfs/haproxy b/lfs/haproxy index 9a54095a8..1103e331a 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -98,5 +98,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #install initscripts $(call INSTALL_INITSCRIPT,haproxy) + # Logrotate + -mkdir -pv /etc/logrotate.d + install -v -m 644 $(DIR_SRC)/config/haproxy/logrotate \ + /etc/logrotate.d/haproxy + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/packages/haproxy b/src/initscripts/packages/haproxy index 78d64cee4..ded627773 100644 --- a/src/initscripts/packages/haproxy +++ b/src/initscripts/packages/haproxy @@ -11,6 +11,15 @@ case "${1}" in start) + # Prepare chroot + mkdir -p /var/lib/haproxy/dev + + # Create link for syslog socket + if ! mountpoint /var/lib/haproxy/dev/log &>/dev/null; then + touch /var/lib/haproxy/dev/log + mount --bind /dev/log /var/lib/haproxy/dev/log + fi + boot_mesg "Starting HAProxy..." loadproc /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \ -p /var/run/haproxy.pid @@ -19,6 +28,11 @@ case "${1}" in stop) boot_mesg "Stopping HAProxy..." killproc /usr/sbin/haproxy + + # umount /dev/log + if mountpoint /var/lib/haproxy/dev/log &>/dev/null; then + umount /var/lib/haproxy/dev/log + fi ;; reload)