haproxy: Log to syslog and install logrotate script

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index cdef756822c88d841ad1e1ff2a7be0d7268f71b7..d5f525a0ecf96f1dd5f3e24f6f80bcb002f420a3 100644 (file)
--- 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 (file)
index 0000000..aa02505
--- /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 515145d5884e2c89f96ed625f70151a36ce037ff..7677ba4ad4a53a48a60b26f7cd5a0365308a5d5b 100644 (file)
--- 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 5e181a91e2b3566e51a9621dcc75eed2f2cd9523..1103e331aa25305d901e6bed552e06e2a780841e 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -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)