packages: cherokee/cherokee.init, cherokee/cherokee.spec, cherokee/cherokee...
jajcus
jajcus at pld-linux.org
Wed May 12 09:10:49 CEST 2010
Author: jajcus Date: Wed May 12 07:10:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- -upstart subpackage
- Release: 2
---- Files affected:
packages/cherokee:
cherokee.init (1.12 -> 1.13) , cherokee.spec (1.35 -> 1.36) , cherokee.upstart (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cherokee/cherokee.init
diff -u packages/cherokee/cherokee.init:1.12 packages/cherokee/cherokee.init:1.13
--- packages/cherokee/cherokee.init:1.12 Wed May 12 08:34:29 2010
+++ packages/cherokee/cherokee.init Wed May 12 09:10:40 2010
@@ -42,11 +42,13 @@
start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/cherokee ]; then
+ 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
else
msg_already_running "Cherokee Web Server"
@@ -56,10 +58,12 @@
stop() {
if [ -f /var/lock/subsys/cherokee ]; then
# 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
else
msg_not_running "Cherokee Web Server"
fi
@@ -103,6 +107,8 @@
RETVAL=7
fi
}
+
+upstart_controlled --except configtest
RETVAL=0
# See how we were called.
================================================================
Index: packages/cherokee/cherokee.spec
diff -u packages/cherokee/cherokee.spec:1.35 packages/cherokee/cherokee.spec:1.36
--- packages/cherokee/cherokee.spec:1.35 Wed May 12 08:05:20 2010
+++ packages/cherokee/cherokee.spec Wed May 12 09:10:40 2010
@@ -15,13 +15,14 @@
Summary(pl.UTF-8): Cherokee - serwer WWW
Name: cherokee
Version: 1.0.0
-Release: 1
+Release: 2
License: GPL v2
Group: Networking/Daemons
Source0: http://www.cherokee-project.com/download/1.0/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 2287f647a0a6645347c525b3557f612c
Source1: %{name}.init
Source2: %{name}.sysconfig
+Source3: %{name}.upstart
Patch0: %{name}-config.patch
Patch1: %{name}-php-path.patch
Patch2: %{name}-panic_path.patch
@@ -40,9 +41,9 @@
BuildRequires: pkgconfig
BuildRequires: python-docutils
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
BuildRequires: zlib-devel
-Requires(post,preun): rc-scripts
+Requires(post,preun): rc-scripts >= 0.4.3.2
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
@@ -79,6 +80,19 @@
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
@@ -144,13 +158,14 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{pam.d,sysconfig,rc.d/init.d},/var/log/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/{init,pam.d,sysconfig,rc.d/init.d},/var/log/%{name}}
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
# users don't need this
mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/cherokee-panic
@@ -200,6 +215,12 @@
%groupremove http
fi
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -298,6 +319,10 @@
%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
@@ -354,6 +379,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2010/05/12 07:10:40 jajcus
+- -upstart subpackage
+- Release: 2
+
Revision 1.35 2010/05/12 06:05:20 jajcus
- Version: 1.0.0 :)
================================================================
Index: packages/cherokee/cherokee.upstart
diff -u /dev/null packages/cherokee/cherokee.upstart:1.1
--- /dev/null Wed May 12 09:10:49 2010
+++ packages/cherokee/cherokee.upstart Wed May 12 09:10:40 2010
@@ -0,0 +1,16 @@
+
+start on pld.network-started and started SERVICE=syslog and started random
+stop on pld.shutdown-started
+
+env SERVICE=web-server
+export SERVICE
+
+respawn
+
+console output
+
+script
+ exec /usr/sbin/cherokee
+end script
+
+# vi: ft=upstart
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee.init?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee.spec?r1=1.35&r2=1.36&f=u
More information about the pld-cvs-commit
mailing list