use systemd.service from upstream tarball

diff --git a/netdata.service b/netdata.service
deleted file mode 100644 (file)
index cb70209..0000000
--- a/netdata.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Linux real time system monitoring, over the web
-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/netdata.pid
-ExecStart=/usr/sbin/netdata -pidfile /var/run/netdata/netdata.pid
-ExecStop=/bin/kill -SIGTERM $MAINPID
-TimeoutStopSec=30
-
-[Install]
-WantedBy=multi-user.target

diff --git a/netdata.spec b/netdata.spec
index 429cfdb8938dd2ce58fea7d30b7bb6a5715b3232..0d19617ae4030facdbc78ad4356d482636b2ab34 100644 (file)
--- a/netdata.spec
+++ b/netdata.spec
@@ -12,7 +12,6 @@ Source0:      https://github.com/firehol/netdata/releases/download/v%{version}/%{name
 # Source0-md5: c23fd94e899e8934c47b14151043be27
 Source1:       %{name}.conf
 Source2:       %{name}.init
-Source3:       %{name}.service
 Patch0:                nodejs.patch
 URL:           http://netdata.firehol.org/
 BuildRequires: autoconf
@@ -114,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir}}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p system/netdata.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT