[packages/lighttpd] use upstream systemd service

glen glen at pld-linux.org
Sat Dec 24 18:38:35 CET 2016


commit 4330480b466f9e52dd620bb8ee751f3d4b110c01
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Dec 24 19:30:25 2016 +0200

    use upstream systemd service
    
    with our patch to use lighttpd-angel and env file

 lighttpd.service | 12 ------------
 lighttpd.spec    |  5 +++--
 2 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/lighttpd.spec b/lighttpd.spec
index 01c9d88..f061e5d 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -63,7 +63,6 @@ Source12:	%{name}.monitrc
 Source13:	branch.sh
 Source14:	TODO
 Source16:	%{name}.tmpfiles
-Source17:	%{name}.service
 Source100:	%{name}-mod_access.conf
 Source101:	%{name}-mod_accesslog.conf
 Source102:	%{name}-mod_alias.conf
@@ -112,6 +111,7 @@ Patch0:		%{name}-use_bin_sh.patch
 Patch1:		%{name}-mod_evasive-status_code.patch
 Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
+Patch4:		systemd.patch
 Patch6:		test-port-setup.patch
 Patch7:		env-documentroot.patch
 URL:		http://www.lighttpd.net/
@@ -912,6 +912,7 @@ Plik monitrc do monitorowania serwera www lighttpd.
 #%patch1 -p1 UPDATE (and submit upstream!) if you need this
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
+%patch4 -p1
 %patch6 -p1
 #%patch7 -p1 probably fixed upstream
 
@@ -984,7 +985,7 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
 cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p doc/systemd/lighttpd.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 
 rm -f $RPM_BUILD_ROOT%{pkglibdir}/*.la
 
diff --git a/lighttpd.service b/lighttpd.service
deleted file mode 100644
index 6f4dce9..0000000
--- a/lighttpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Lighttpd Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/lighttpd
-ExecStartPre=/usr/sbin/lighttpd-angel -t -f /etc/lighttpd/lighttpd.conf
-ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lighttpd.git/commitdiff/c7f64df8eeed371d78d4b1f66a6f2c04c5ae3502



More information about the pld-cvs-commit mailing list