Merge 868f4707bf into 553208a960

README.md

@@ -36,8 +36,8 @@ Latest:
 
 ##### Package instructions:
 
-* Telegraf binary is installed in `/opt/telegraf/telegraf`
-* Telegraf daemon configuration file is in `/etc/opt/telegraf/telegraf.conf`
+* Telegraf binary is installed in `/usr/bin/telegraf`
+* Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf`
 * On sysv systems, the telegraf daemon can be controlled via
 `service telegraf [action]`
 * On systemd systems (such as Ubuntu 15+), the telegraf daemon can be

scripts/init.sh

@@ -98,7 +98,7 @@ function log_success_msg() {
 name=telegraf
 
 # Daemon name, where is the actual executable
-daemon=/opt/telegraf/telegraf
+daemon=/usr/bin/telegraf
 
 # pid file for the daemon
 pidfile=/var/run/telegraf/telegraf.pid
@@ -110,7 +110,7 @@ if [ ! -d "$piddir" ]; then
 fi
 
 # Configuration file
-config=/etc/opt/telegraf/telegraf.conf
+config=/etc/telegraf/telegraf.conf
 
 # If the daemon is not there, then exit.
 [ -x $daemon ] || exit 5

scripts/package.sh

@@ -32,8 +32,9 @@
 AWS_FILE=~/aws.conf
 
 INSTALL_ROOT_DIR=/opt/telegraf
+INSTALL_BIN_DIR=/usr/bin
 TELEGRAF_LOG_DIR=/var/log/telegraf
-CONFIG_ROOT_DIR=/etc/opt/telegraf
+CONFIG_ROOT_DIR=/etc/telegraf
 LOGROTATE_DIR=/etc/logrotate.d
 
 SAMPLE_CONFIGURATION=etc/config.sample.toml
@@ -144,7 +145,6 @@ generate_postinstall_script() {
 #!/bin/sh
 rm -f $INSTALL_ROOT_DIR/telegraf
 rm -f $INSTALL_ROOT_DIR/init.sh
-ln -sfn $INSTALL_ROOT_DIR/versions/$version/telegraf $INSTALL_ROOT_DIR/telegraf
 
 if ! id telegraf >/dev/null 2>&1; then
     useradd --help 2>&1| grep -- --system > /dev/null 2>&1
@@ -168,7 +168,8 @@ else
     ln -sfn $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh \
         $INSTALL_ROOT_DIR/init.sh
     rm -f /etc/init.d/telegraf
-    ln -sfn $INSTALL_ROOT_DIR/init.sh /etc/init.d/telegraf
+    ln -sfn $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh \
+        /etc/init.d/telegraf
     chmod +x /etc/init.d/telegraf
     # update-rc.d sysv service:
     if which update-rc.d > /dev/null 2>&1 ; then
@@ -211,12 +212,18 @@ make_dir_tree $TMP_WORK_DIR $VERSION
 ###########################################################################
 # Copy the assets to the installation directories.
 
+mkdir -p $TMP_WORK_DIR/$INSTALL_BIN_DIR
 for b in ${BINS[*]}; do
     cp $GOPATH_INSTALL/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION
     if [ $? -ne 0 ]; then
         echo "Failed to copy binaries to packaging directory -- aborting."
         cleanup_exit 1
     fi
+    ln -s /$INSTALL_ROOT_DIR/versions/$VERSION $TMP_WORK_DIR/$INSTALL_BIN_DIR
+    if [ $? -ne 0 ]; then
+        echo "Failed to link binaries to packaging directory -- aborting."
+        cleanup_exit 1
+    fi
 done
 
 echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION"

scripts/telegraf.service

@@ -6,7 +6,7 @@ After=network.target
 [Service]
 EnvironmentFile=-/etc/default/telegraf
 User=telegraf
-ExecStart=/opt/telegraf/telegraf -config /etc/opt/telegraf/telegraf.conf $TELEGRAF_OPTS
+ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf $TELEGRAF_OPTS
 Restart=on-failure
 KillMode=process