From 68d1818ce4977be3a066b25a8a509ed524ce5998 Mon Sep 17 00:00:00 2001 From: Bill Findley Date: Fri, 18 Sep 2015 15:47:41 -0400 Subject: [PATCH 1/2] changes to makefile to package an RPM that uses a conf.d dir rather than a single config file. --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b7b4ccdd..8ad2a9cc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,8 @@ generate-init-script: pleaserun --install --no-install-actions --install-prefix ./build \ --chdir /var/lib/logstash-forwarder \ --sysv-log-path /var/log/logstash-forwarder/ \ - --overwrite -p sysv -v lsb-3.1 $(PREFIX)/bin/logstash-forwarder -config /etc/logstash-forwarder.conf + --overwrite -p sysv -v lsb-3.1 $(PREFIX)/bin/logstash-forwarder -config /etc/logstash-forwarder.conf.d + build/empty: | build mkdir $@ @@ -43,9 +44,9 @@ rpm deb: compile generate-init-script build/empty --after-install $(AFTER_INSTALL) \ --before-install $(BEFORE_INSTALL) \ --before-remove $(BEFORE_REMOVE) \ - --config-files /etc/logstash-forwarder.conf \ + --config-files /etc/logstash-forwarder.conf.d \ ./logstash-forwarder=$(PREFIX)/bin/ \ - ./logstash-forwarder.conf.example=/etc/logstash-forwarder.conf \ + ./logstash-forwarder.conf.example=/etc/logstash-forwarder.conf.d/logstash-forwarder.conf \ ./build/etc=/ \ ./build/empty/=/var/lib/logstash-forwarder/ \ ./build/empty/=/var/log/logstash-forwarder/ \ From db7b3618dc39bd73c0bdf3887ed6ed25e15c3dc4 Mon Sep 17 00:00:00 2001 From: Bill Findley Date: Wed, 7 Oct 2015 14:07:29 -0400 Subject: [PATCH 2/2] post-upgrade, move the old config to the conf.d dir and restart service. --- pkg/centos/after-install.sh | 9 ++++++++- pkg/ubuntu/after-install.sh | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/centos/after-install.sh b/pkg/centos/after-install.sh index 43ca04ff..ab53c9dc 100644 --- a/pkg/centos/after-install.sh +++ b/pkg/centos/after-install.sh @@ -1,7 +1,14 @@ +#!/bin/sh + /sbin/chkconfig --add logstash-forwarder chown -R logstash-forwarder:logstash-forwarder /opt/logstash-forwarder chown logstash-forwarder /var/log/logstash-forwarder chown logstash-forwarder:logstash-forwarder /var/lib/logstash-forwarder - +if [ -f /etc/logstash-forwarder.conf ]; then + echo "Found /etc/logstash-forwarder.conf. Moving to /etc/logstash-forwarder.conf.d/logstash-forwarder.conf" + mv /etc/logstash-forwarder.conf /etc/logstash-forwarder.conf.d + echo "restarting logstash-forwarder with the new config" + service logstash-forwarder restart +fi echo "Logs for logstash-forwarder will be in /var/log/logstash-forwarder/" diff --git a/pkg/ubuntu/after-install.sh b/pkg/ubuntu/after-install.sh index 37b00e53..eea3406a 100644 --- a/pkg/ubuntu/after-install.sh +++ b/pkg/ubuntu/after-install.sh @@ -4,5 +4,10 @@ chown -R logstash-forwarder:logstash-forwarder /opt/logstash-forwarder chown logstash-forwarder /var/log/logstash-forwarder chown logstash-forwarder:logstash-forwarder /var/lib/logstash-forwarder update-rc.d logstash-forwarder defaults - +if [ -f /etc/logstash-forwarder.conf ]; then + echo "Found /etc/logstash-forwarder.conf. Moving to /etc/logstash-forwarder.conf.d/logstash-forwarder.conf" + mv /etc/logstash-forwarder.conf /etc/logstash-forwarder.conf.d + echo "restarting logstash-forwarder with the new config" + service logstash-forwarder restart +fi echo "Logs for logstash-forwarder will be in /var/log/logstash-forwarder/"