build: rename systemd service and reorg system directory

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 6dcdfc1d1983682d64675f05233483b6da12921a..f29c4a34740e5c9ee09961d0fb4a169a73cdb167 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,16 +24,15 @@ EXTRA_DIST = \
        autogen.sh \
        netdata-9999.ebuild \
        tests/stress.sh \
-       system/netdata-openrc \
-       system/netdata-systemd \
        $(NULL)
 
 SUBDIRS = \
        charts.d \
-       node.d \
        conf.d \
+       node.d \
        plugins.d \
        src \
+       system \
        web \
        $(NULL)
 

diff --git a/configure.ac b/configure.ac
index 8d6f441e8780c8fef512aef3486177e05a7399f3..ab1550614fc629698933586d47979bc1403d50f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,11 +159,12 @@ AC_SUBST([OPTIONAL_ZLIB_LIBS])
 AC_CONFIG_FILES([
        Makefile
        charts.d/Makefile
-       node.d/Makefile
        conf.d/Makefile
        netdata.spec
+       node.d/Makefile
        plugins.d/Makefile
        src/Makefile
+       system/Makefile
        web/Makefile
 ])
 AC_OUTPUT

diff --git a/netdata-9999.ebuild b/netdata-9999.ebuild
index 5ef560eb6bd054f07f9899d10dc99a5b286207c4..414ff99719845e13ba1c3aff8935c92c418d6628 100644 (file)
--- a/netdata-9999.ebuild
+++ b/netdata-9999.ebuild
@@ -88,5 +88,5 @@ src_install() {
        fowners ${PN} /var/log/netdata
 
        newinitd system/netdata-openrc ${PN}
-       systemd_newunit system/netdata-systemd ${PN}.service
+       systemd_dounit system/netdata.service
 }

diff --git a/system/Makefile.am b/system/Makefile.am
new file mode 100644 (file)
index 0000000..d52fbdd
--- /dev/null
+++ b/system/Makefile.am
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+       netdata-openrc \
+       netdata.service \
+       $(NULL)

diff --git a/system/netdata-systemd b/system/netdata-systemd
deleted file mode 100644 (file)
index 20a775b..0000000
--- a/system/netdata-systemd
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=netdata
-After=network.target httpd.service squid.service nfs-server.service mysqld.service named.service postfix.service
-
-[Service]
-Type=forking
-WorkingDirectory=/tmp
-User=root
-Group=root
-PIDFile=/var/run/netdata.pid
-ExecStart=/usr/sbin/netdata
-ExecStop=/bin/kill -SIGTERM $MAINPID
-TimeoutStopSec=30
-
-[Install]
-WantedBy=multi-user.target

diff --git a/system/netdata.service b/system/netdata.service
new file mode 100644 (file)
index 0000000..20a775b
--- /dev/null
+++ b/system/netdata.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=netdata
+After=network.target httpd.service squid.service nfs-server.service mysqld.service named.service postfix.service
+
+[Service]
+Type=forking
+WorkingDirectory=/tmp
+User=root
+Group=root
+PIDFile=/var/run/netdata.pid
+ExecStart=/usr/sbin/netdata
+ExecStop=/bin/kill -SIGTERM $MAINPID
+TimeoutStopSec=30
+
+[Install]
+WantedBy=multi-user.target