add files for fix installation

6 files changed, 121 insertions, 16 deletions

diff --git a/makeself/install-or-update.sh b/makeself/install-or-update.sh
new file mode 100644
index 0000000000..114d42ff61
--- /dev/null
+++ b/makeself/install-or-update.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+. $(dirname "${0}")/functions.sh
+
+progress "Add user netdata to required user groups"
+
+NETDATA_ADDED_TO_DOCKER=0
+NETDATA_ADDED_TO_NGINX=0
+NETDATA_ADDED_TO_VARNISH=0
+NETDATA_ADDED_TO_HAPROXY=0
+NETDATA_ADDED_TO_ADM=0
+NETDATA_ADDED_TO_NSD=0
+if [ ${UID} -eq 0 ]
+    then
+    portable_add_group netdata
+    portable_add_user netdata
+    portable_add_user_to_group docker   netdata && NETDATA_ADDED_TO_DOCKER=1
+    portable_add_user_to_group nginx    netdata && NETDATA_ADDED_TO_NGINX=1
+    portable_add_user_to_group varnish  netdata && NETDATA_ADDED_TO_VARNISH=1
+    portable_add_user_to_group haproxy  netdata && NETDATA_ADDED_TO_HAPROXY=1
+    portable_add_user_to_group adm      netdata && NETDATA_ADDED_TO_ADM=1
+    portable_add_user_to_group nsd      netdata && NETDATA_ADDED_TO_NSD=1
+    run_ok
+else
+    run_failed "The installer does not run as root."
+fi
+
+# -----------------------------------------------------------------------------
+progress "Install logrotate configuration for netdata"
+
+if [ ${UID} -eq 0 ]
+    then
+    if [ -d /etc/logrotate.d -a ! -f /etc/logrotate.d/netdata ]
+        then
+        run cp system/netdata.logrotate /etc/logrotate.d/netdata
+    fi
+
+    if [ -f /etc/logrotate.d/netdata ]
+        then
+        run chmod 644 /etc/logrotate.d/netdata
+    fi
+fi
+
+# -----------------------------------------------------------------------------
+progress "Install netdata at system init"
+
+if [ "${UID}" -eq 0 ]
+    then
+    install_netdata_service
+fi
+
+
diff --git a/makeself/jobs/70-netdata-git.install.sh b/makeself/jobs/70-netdata-git.install.sh
index 1ba2fab114..acfa374414 100755
--- a/makeself/jobs/70-netdata-git.install.sh
+++ b/makeself/jobs/70-netdata-git.install.sh
@@ -10,10 +10,15 @@ run ./netdata-installer.sh --install /opt --dont-wait --dont-start-it
 mkdir -p "${NETDATA_INSTALL_PATH}/system"
 
 cp \
-	system/netdata-init-d \
-	system/netdata-lsb \
-	system/netdata-openrc \
-	system/netdata.logrotate \
-	system/netdata.service \
-	"${NETDATA_INSTALL_PATH}/system/"
+    system/netdata-init-d \
+    system/netdata-lsb \
+    system/netdata-openrc \
+    system/netdata.logrotate \
+    system/netdata.service \
+    "${NETDATA_INSTALL_PATH}/system/"
 
+cp \
+    makeself/post-installer.sh \
+    makeself/install-or-update.sh \
+    installer/functions.sh \
+    "${NETDATA_INSTALL_PATH}/system/"
diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
index 2b55d36bd6..b7193d90e5 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/makeself/jobs/99-makeself.install.sh
@@ -2,6 +2,8 @@
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
+
+
 "${NETDATA_MAKESELF_PATH}/makeself.sh" \
     --gzip \
     --notemp \
@@ -11,8 +13,8 @@
     --help-header "${NETDATA_MAKESELF_PATH}/makeself-help-header.txt" \
     "${NETDATA_INSTALL_PATH}" \
     "${NETDATA_INSTALL_PATH}.gz.run" \
-    "LABEL: netdata, real-time performance monitoring" \
-    ./system/install-or-update.sh \
+    "netdata, the real-time performance and health monitoring system" \
+    ./system/post-installer.sh \
     ${NULL}
 
 
diff --git a/makeself/makeself-help-header.txt b/makeself/makeself-help-header.txt
index ebf6ebf90a..36e82824c1 100644
--- a/makeself/makeself-help-header.txt
+++ b/makeself/makeself-help-header.txt
@@ -1,3 +1,29 @@
-netdata help header
+
+  ^
+  |.-.   .-.   .-.   .-.   .  netdata                                        
+  |   '-'   '-'   '-'   '-'   real-time performance monitoring, done right!  
+  +----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
+
+  (C) Copyright 2017, Costa Tsaousis
+  All rights reserved
+
+  Released under GPL v3+
+
+  You are about to build and install netdata to your system.
+
+  It will be installed at these locations:
+
+   - the daemon     at /opt/netdata/usr/sbin/netdata
+   - config files   in /opt/netdata/etc/netdata
+   - web files      in /opt/netdata/usr/share/netdata
+   - plugins        in /opt/netdata/usr/libexec/netdata
+   - cache files    in /opt/netdata/var/cache/netdata
+   - db files       in /opt/netdata/var/lib/netdata
+   - log files      in /opt/netdata/var/log/netdata
+   - pid file       at /opt/netdata/var/run/netdata.pid
+
+  netdata re-distributes a lot of open source software components.
+  Check its full license at:
+  https://github.com/firehol/netdata/blob/master/LICENSE.md
 
 
diff --git a/makeself/makeself-license.txt b/makeself/makeself-license.txt
index 6e602bb662..5f8b75df66 100644
--- a/makeself/makeself-license.txt
+++ b/makeself/makeself-license.txt
@@ -1,11 +1,28 @@
-netdata
-(C) Copyright 2017, Costa Tsaousis
-All rights reserved
 
-Released under GPL v3+
+  ^
+  |.-.   .-.   .-.   .-.   .  netdata                                        
+  |   '-'   '-'   '-'   '-'   real-time performance monitoring, done right!  
+  +----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
 
-netdata re-distributes a lot of open source software components.
-Check its full license at:
+  (C) Copyright 2017, Costa Tsaousis
+  All rights reserved
 
-https://github.com/firehol/netdata/blob/master/LICENSE.md
+  Released under GPL v3+
+
+  You are about to build and install netdata to your system.
+
+  It will be installed at these locations:
+
+   - the daemon     at /opt/netdata/usr/sbin/netdata
+   - config files   in /opt/netdata/etc/netdata
+   - web files      in /opt/netdata/usr/share/netdata
+   - plugins        in /opt/netdata/usr/libexec/netdata
+   - cache files    in /opt/netdata/var/cache/netdata
+   - db files       in /opt/netdata/var/lib/netdata
+   - log files      in /opt/netdata/var/log/netdata
+   - pid file       at /opt/netdata/var/run/netdata.pid
+
+  netdata re-distributes a lot of open source software components.
+  Check its full license at:
+  https://github.com/firehol/netdata/blob/master/LICENSE.md
 
diff --git a/makeself/post-installer.sh b/makeself/post-installer.sh
new file mode 100644
index 0000000000..f969c24913
--- /dev/null
+++ b/makeself/post-installer.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./bin/bash system/install-or-update.sh "${@}"