[packages/cherokee] drop all Upstart hacks
jajcus
jajcus at pld-linux.org
Thu Apr 23 09:54:59 CEST 2015
commit 732bd7164e9d5a221d9298b55e8ede3f7dfedf98
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Thu Apr 23 09:40:35 2015 +0200
drop all Upstart hacks
Release: 4
cherokee.init | 6 ------
cherokee.spec | 33 ++++-----------------------------
cherokee.upstart | 16 ----------------
3 files changed, 4 insertions(+), 51 deletions(-)
---
diff --git a/cherokee.spec b/cherokee.spec
index 90a66e9..8d9ae98 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -14,7 +14,7 @@ Summary: Fast, Flexible and Lightweight Web server
Summary(pl.UTF-8): Cherokee - serwer WWW
Name: cherokee
Version: 1.2.103
-Release: 3
+Release: 4
License: GPL v2
Group: Networking/Daemons
Source0: https://github.com/cherokee/webserver/archive/v%{version}.zip
@@ -24,8 +24,7 @@ Source1: CTK-20120806.tar.xz
# Source1-md5: 567f087cd6cdf10b89047535cbe94f8e
Source2: %{name}.init
Source3: %{name}.sysconfig
-Source4: %{name}.upstart
-Source5: %{name}.service
+Source4: %{name}.service
Patch0: %{name}-config.patch
Patch1: %{name}-panic_path.patch
Patch2: ffmpeg0.11.patch
@@ -87,19 +86,6 @@ znaków, TLS/SSL poprzez OpenSSL, hosty wirtualne, uwierzytelnianie,
opcje związane z pamięcią podręczną, PHP, własne zarządzanie błędami i
wiele więcej.
-%package upstart
-Summary: Upstart job description for the Cherokee web server
-Summary(pl.UTF-8): Opis zadania Upstart dla serwera Cherokee
-Group: Daemons
-Requires: %{name} = %{version}-%{release}
-Requires: upstart >= 0.6
-
-%description upstart
-Upstart job description for the Cherokee web server.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla serwera WWW Cherokee.
-
%package admin
Summary: Cherokee web server administration interface
Summary(pl.UTF-8): Interfejs administracyjny serwera WWW Cherokee
@@ -171,7 +157,7 @@ touch po/admin/*.po
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{init,pam.d,sysconfig,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,sysconfig,rc.d/init.d} \
$RPM_BUILD_ROOT/var/log/%{name} \
$RPM_BUILD_ROOT%{systemdunitdir}
@@ -180,8 +166,7 @@ install -d $RPM_BUILD_ROOT/etc/{init,pam.d,sysconfig,rc.d/init.d} \
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-install %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/cherokee.service
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/cherokee.service
# users don't need this
mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/cherokee-panic
@@ -243,12 +228,6 @@ fi
%triggerpostun -- %{name} < 1.2.103-1
%systemd_trigger %{name}.service
-%post upstart
-%upstart_post %{name}
-
-%postun upstart
-%upstart_postun %{name}
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -354,10 +333,6 @@ fi
%dir %attr(771,cherokee,cherokee) /var/lib/%{name}/graphs
%dir %attr(771,cherokee,cherokee) /var/lib/%{name}/graphs/images
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-
%files admin -f %{name}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/cherokee-admin
diff --git a/cherokee.init b/cherokee.init
index b58e8d0..fc29202 100644
--- a/cherokee.init
+++ b/cherokee.init
@@ -79,13 +79,11 @@ start() {
return
fi
- emit starting JOB=cherokee SERVICE=web-server
msg_starting "Cherokee Web Server"
daemon cherokee -d
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
touch /var/lock/subsys/cherokee
- emit --no-wait started JOB=cherokee SERVICE=web-server
fi
}
@@ -96,12 +94,10 @@ stop() {
fi
# Stop daemons.
- emit stopping JOB=cherokee SERVICE=web-server
msg_stopping "Cherokee Web Server"
killproc cherokee
RETVAL=$?
rm -f /var/lock/subsys/cherokee >/dev/null 2>&1
- emit --no-wait stopped JOB=cherokee SERVICE=web-server
}
condrestart() {
@@ -138,8 +134,6 @@ reload() {
fi
}
-upstart_controlled --except configtest
-
RETVAL=0
# See how we were called.
case "$1" in
diff --git a/cherokee.upstart b/cherokee.upstart
deleted file mode 100644
index af668f1..0000000
--- a/cherokee.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-
-start on pld.network-started and started random
-stop on pld.shutdown-started
-
-env SERVICE_web_server=y
-export SERVICE_web_server
-
-respawn
-
-console output
-
-script
- exec /usr/sbin/cherokee
-end script
-
-# vi: ft=upstart
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cherokee.git/commitdiff/732bd7164e9d5a221d9298b55e8ede3f7dfedf98
More information about the pld-cvs-commit
mailing list