CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(packaging): Revert permission change on configs (#13909)

This commit is contained in:
Joshua Powers 2023-09-12 08:50:26 -06:00 committed by GitHub
parent 6832e6cc8c
commit 68da07a1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -356,7 +356,7 @@ $(include_packages):
--url https://github.com/influxdata/telegraf \ --url https://github.com/influxdata/telegraf \
--license MIT \ --license MIT \
--maintainer support@influxdb.com \ --maintainer support@influxdb.com \
--config-files /etc/telegraf/telegraf.conf.sample \ --config-files /etc/telegraf/telegraf.conf \
--config-files /etc/telegraf/telegraf.d/.ignore \ --config-files /etc/telegraf/telegraf.d/.ignore \
--config-files /etc/logrotate.d/telegraf \ --config-files /etc/logrotate.d/telegraf \
--after-install scripts/rpm/post-install.sh \ --after-install scripts/rpm/post-install.sh \
@ -472,7 +472,6 @@ windows_i386.zip windows_amd64.zip windows_arm64.zip: export EXEEXT := .exe
%.deb: export localstatedir := /var %.deb: export localstatedir := /var
%.rpm: export pkg := rpm %.rpm: export pkg := rpm
%.rpm: export prefix := /usr %.rpm: export prefix := /usr
%.rpm: export conf_suffix := .sample
%.rpm: export sysconfdir := /etc %.rpm: export sysconfdir := /etc
%.rpm: export localstatedir := /var %.rpm: export localstatedir := /var
%.tar.gz: export pkg := tar %.tar.gz: export pkg := tar

2
scripts/deb/post-install.sh
View File

@ -44,8 +44,6 @@ fi
# If 'telegraf.conf' is not present use package's sample (fresh install) # If 'telegraf.conf' is not present use package's sample (fresh install)
if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then
cp /etc/telegraf/telegraf.conf.sample /etc/telegraf/telegraf.conf cp /etc/telegraf/telegraf.conf.sample /etc/telegraf/telegraf.conf
chmod 640 /etc/telegraf/telegraf.conf
chmod 750 /etc/telegraf/telegraf.d
fi fi
LOG_DIR=/var/log/telegraf LOG_DIR=/var/log/telegraf

5
scripts/rpm/post-install.sh
View File

@ -20,11 +20,8 @@ if [[ ! -d /etc/telegraf/telegraf.d ]]; then
fi fi
# If 'telegraf.conf' is not present use package's sample (fresh install) # If 'telegraf.conf' is not present use package's sample (fresh install)
if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ ! -f /etc/telegraf/telegraf.conf.rpmnew ]] && if [[ ! -f /etc/telegraf/telegraf.conf ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then
[[ ! -f /etc/telegraf/telegraf.conf.rpmsave ]] && [[ -f /etc/telegraf/telegraf.conf.sample ]]; then
cp /etc/telegraf/telegraf.conf.sample /etc/telegraf/telegraf.conf cp /etc/telegraf/telegraf.conf.sample /etc/telegraf/telegraf.conf
chmod 640 /etc/telegraf/telegraf.conf
chmod 750 /etc/telegraf/telegraf.d
fi fi
# Set up log directories # Set up log directories