just one service file

diff --git a/nginx-light.service b/nginx-light.service
deleted file mode 100644 (file)
index d8211ec..0000000
--- a/nginx-light.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Nginx Web Server (light version)
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/nginx-light.pid
-ExecStartPre=/usr/sbin/nginx-light -c /etc/nginx/nginx-light.conf -t
-ExecStart=/usr/sbin/nginx-light -c /etc/nginx/nginx-light.conf
-ExecReload=/usr/sbin/nginx-light -c /etc/nginx/nginx-light.conf -s reload
-ExecStop=/usr/sbin/nginx-light -c /etc/nginx/nginx-light.conf -s stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nginx-mail.service b/nginx-mail.service
deleted file mode 100644 (file)
index 01326b3..0000000
--- a/nginx-mail.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Nginx Web Server (mail version)
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/nginx-mail.pid
-ExecStartPre=/usr/sbin/nginx-mail -c /etc/nginx/nginx-mail.conf -t
-ExecStart=/usr/sbin/nginx-mail -c /etc/nginx/nginx-mail.conf
-ExecReload=/usr/sbin/nginx-mail -c /etc/nginx/nginx-mail.conf -s reload
-ExecStop=/usr/sbin/nginx-mail -c /etc/nginx/nginx-mail.conf -s stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nginx-perl.service b/nginx-perl.service
deleted file mode 100644 (file)
index feb911e..0000000
--- a/nginx-perl.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Nginx Web Server (perl version)
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/nginx-perl.pid
-ExecStartPre=/usr/sbin/nginx-perl -c /etc/nginx/nginx-perl.conf -t
-ExecStart=/usr/sbin/nginx-perl -c /etc/nginx/nginx-perl.conf
-ExecReload=/usr/sbin/nginx-perl -c /etc/nginx/nginx-perl.conf -s reload
-ExecStop=/usr/sbin/nginx-perl -c /etc/nginx/nginx-perl.conf -s stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/nginx-standard.service b/nginx.service
similarity index 100%
rename from nginx-standard.service
rename to nginx.service

diff --git a/nginx.spec b/nginx.spec
index 158be8ae1f156c4861f610d674318a92db06b589..2629420b69579e6f5664fcf3304e1c46f17e0d57 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -56,10 +56,7 @@ Source12:    %{name}-perl.monitrc
 Source14:      %{name}.conf
 Source15:      %{name}-standard.monitrc
 Source17:      %{name}-mime.types.sh
-Source18:      %{name}-standard.service
-Source19:      %{name}-light.service
-Source20:      %{name}-perl.service
-Source21:      %{name}-mail.service
+Source18:      %{name}.service
 Source22:      http://www.modsecurity.org/tarball/%{modsecurity_version}/modsecurity-%{modsecurity_version}.tar.gz
 # Source22-md5:        0fa92b852abc857a20b9e24f83f814cf
 Source101:     https://github.com/arut/nginx-rtmp-module/archive/v%{rtmp_version}/nginx-rtmp-module-%{rtmp_version}.tar.gz
@@ -445,7 +442,7 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/*.default
 
 cp -p %{_sourcedir}/%{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-cp -p %{_sourcedir}/%{name}-standard.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p %{_sourcedir}/%{name}.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 cp -p %{_sourcedir}/%{name}-standard.monitrc $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}