- removed obsolete upstart stuff and cleaned systemd infestation

diff --git a/lighttpd.service b/lighttpd.service
deleted file mode 100644 (file)
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

diff --git a/lighttpd.spec b/lighttpd.spec
index c2c48943e7dbd5ddcd656aa2c317a4268b6d64e8..aa7e2bca083cf905b13d8eecb05456f6900ed38a 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -53,9 +53,6 @@ Source11:     %{name}-pld.html
 Source12:      %{name}.monitrc
 Source13:      branch.sh
 Source14:      TODO
-Source15:      %{name}.upstart
-Source16:      %{name}.tmpfiles
-Source17:      %{name}.service
 Source100:     %{name}-mod_access.conf
 Source101:     %{name}-mod_accesslog.conf
 Source102:     %{name}-mod_alias.conf
@@ -148,7 +145,6 @@ Requires:   %{name}-mod_indexfile = %{version}-%{release}
 Requires:      %{name}-mod_staticfile = %{version}-%{release}
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      rpm-whiteout >= 1.5
-Requires:      systemd-units >= 38
 Suggests:      %{name}-mod_accesslog
 Provides:      group(http)
 Provides:      group(lighttpd)
@@ -894,8 +890,7 @@ install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d
        $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
        $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
        $RPM_BUILD_ROOT/var/lib/lighttpd \
-       $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress \
-       $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
+       $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -905,9 +900,6 @@ cp -p %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir}
 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 %{SOURCE15} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -1001,14 +993,12 @@ for a in access.log error.log breakage.log; do
        fi
 done
 /sbin/chkconfig --add %{name}
-%systemd_post %{name}.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service %{name} stop
        /sbin/chkconfig --del %{name}
 fi
-%systemd_preun %{name}.service
 
 %postun
 if [ "$1" = "0" ]; then
@@ -1016,7 +1006,6 @@ if [ "$1" = "0" ]; then
        %groupremove lighttpd
        %groupremove http
 fi
-%systemd_reload
 
 %posttrans
 # minimizing lighttpd restarts logics. we restart webserver:
@@ -1115,7 +1104,6 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(750,root,root) %dir /var/log/archive/%{name}
@@ -1124,8 +1112,6 @@ fi
 %attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/error.log
 %attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/breakage.log
 %dir %attr(770,root,lighttpd) /var/run/%{name}
-%{systemdtmpfilesdir}/%{name}.conf
-%{systemdunitdir}/%{name}.service
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
 %attr(755,root,root) %{_sbindir}/lighttpd

diff --git a/lighttpd.tmpfiles b/lighttpd.tmpfiles
deleted file mode 100644 (file)
index 3918a40..0000000
--- a/lighttpd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/lighttpd 0770 root lighttpd -

diff --git a/lighttpd.upstart b/lighttpd.upstart
deleted file mode 100644 (file)
index 8bb9b70..0000000
--- a/lighttpd.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-description "Lighttpd Web Server"
-
-start on pld.network-started
-stop on pld.shutdown-started
-
-respawn
-
-console output
-
-env SHELL=/bin/sh
-
-script
-       # Source old-style service configuration
-       [ -f /etc/sysconfig/lighttpd ] && . /etc/sysconfig/lighttpd
-       exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
-end script