From 07562efc3caac669e618208ff941057953e7200e Mon Sep 17 00:00:00 2001
From: gunnaraasen <gunnar.r.aasen@gmail.com>
Date: Wed, 11 Jan 2017 13:02:49 -0800
Subject: [PATCH] Remove RPM posttrans scriptlet and small fixes

---
 CHANGELOG.md                   | 1 +
 etc/build.py                   | 2 +-
 etc/scripts/chronograf.service | 1 -
 etc/scripts/post-install.sh    | 3 +++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f37e43ff0..4b9898be51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.
diff --git a/etc/build.py b/etc/build.py
index 2db007cb5c..466bcb74cc 100755
--- a/etc/build.py
+++ b/etc/build.py
@@ -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"))
diff --git a/etc/scripts/chronograf.service b/etc/scripts/chronograf.service
index 55a82e921d..422f6cd925 100644
--- a/etc/scripts/chronograf.service
+++ b/etc/scripts/chronograf.service
@@ -14,4 +14,3 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-Alias=chronograf.service
diff --git a/etc/scripts/post-install.sh b/etc/scripts/post-install.sh
index 420b8f1de5..0d570c53b8 100644
--- a/etc/scripts/post-install.sh
+++ b/etc/scripts/post-install.sh
@@ -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