Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

changes to makefile to package an RPM that uses a conf.d config #527

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

changes to makefile to package an RPM that uses a conf.d config #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d1818
changes to makefile to package an RPM that uses a conf.d dir rather t…
Sep 18, 2015
db7b361
post-upgrade, move the old config to the conf.d dir and restart service.
Oct 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand All @@ -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/ \
9 changes: 8 additions & 1 deletion pkg/centos/after-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
7 changes: 6 additions & 1 deletion pkg/ubuntu/after-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"