Merge pull request #756 from influxdata/ga-rpm-install

Remove RPM posttrans scriptlet and small fixes
pull/10616/head
Chris Goller 2017-01-11 17:53:07 -06:00 committed by GitHub
commit 34f2d3ba27
4 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@
### Upcoming Bug Fixes
1. [#755](https://github.com/influxdata/chronograf/pull/755): Fix kapacitor basic auth proxying
2. [#704](https://github.com/influxdata/chronograf/issue/704): Fix RPM install script and systemd unit file
### Upcoming Features
1. [#660](https://github.com/influxdata/chronograf/issues/660): Add option to accept any certificate from InfluxDB.

View File

@ -647,7 +647,7 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
package_build_root,
current_location)
if package_type == "rpm":
fpm_command += "--depends coreutils --rpm-posttrans {} ".format(POSTINST_SCRIPT)
fpm_command += "--depends coreutils"
# TODO: Check for changelog
# elif package_type == "deb":
# fpm_command += "--deb-changelog {} ".format(os.path.join(os.getcwd(), "CHANGELOG.md"))

View File

@ -14,4 +14,3 @@ Restart=on-failure
[Install]
WantedBy=multi-user.target
Alias=chronograf.service

View File

@ -12,6 +12,9 @@ function install_init {
}
function install_systemd {
# Remove any existing symlinks
rm -f /etc/systemd/system/chronograf.service
cp -f $SCRIPT_DIR/chronograf.service /lib/systemd/system/chronograf.service
systemctl enable chronograf || true
systemctl daemon-reload || true