OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 12:09:33
Branch: HEAD Handle: 2003072311093101
Modified files:
openpkg-src/pks pks.spec rc.pks
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.23 +1 -1 openpkg-src/pks/pks.spec
1.16 +23 -4 openpkg-src/pks/rc.pks
1.5744 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 pks.spec
--- openpkg-src/pks/pks.spec 22 Jul 2003 08:10:59 -0000 1.22
+++ openpkg-src/pks/pks.spec 23 Jul 2003 10:09:32 -0000 1.23
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 0.9.6
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/rc.pks
============================================================================
$ cvs diff -u -r1.15 -r1.16 rc.pks
--- openpkg-src/pks/rc.pks 22 Jul 2003 08:10:59 -0000 1.15
+++ openpkg-src/pks/rc.pks 23 Jul 2003 10:09:32 -0000 1.16
@@ -11,6 +11,21 @@
pks_log_minsize="1M"
pks_log_complevel="9"
+%common
+ pks_pidfile="@l_prefix@/var/pks/pks-queue-run.pid"
+ pks_signal () {
+ [ -f $pks_pidfile ] && kill -$1 `cat $pks_pidfile`
+ }
+
+%status -u @l_rusr@ -o
+ pks_usable="unknown"
+ pks_active="no"
+ rcService pks enable yes && \
+ pks_signal 0 && pks_active="yes"
+ echo "pks_enable=\"$pks_enable\""
+ echo "pks_usable=\"$pks_usable\""
+ echo "pks_active=\"$pks_active\""
+
%start -u @l_rusr@
rcService pks enable yes || exit 0
(nohup @l_prefix@/sbin/pksd \
@@ -25,10 +40,14 @@
%stop -u @l_rusr@
rcService pks enable yes || exit 0
@l_prefix@/bin/pksdctl @l_prefix@/var/pks/pksd.ctl shutdown
- if [ -f @l_prefix@/var/pks/pks-queue-run.pid ]; then
- kill `cat @l_prefix@/var/pks/pks-queue-run.pid` >/dev/null 2>&1
- rm -f @l_prefix@/var/pks/pks-queue-run.pid
- fi
+ pks_signal TERM
+ rm -f $pks_pidfile 2>/dev/null || true
+
+%restart -u @l_rusr@
+ rcService pks enable yes || exit 0
+ rc pks stop
+ sleep 2
+ rc pks start
%daily -u @l_rusr@
rcService pks enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5743 -r1.5744 news.txt
--- openpkg-web/news.txt 23 Jul 2003 09:56:53 -0000 1.5743
+++ openpkg-web/news.txt 23 Jul 2003 10:09:31 -0000 1.5744
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<pks-0.9.6-20030723>
23-Jul-2003: Upgraded package: P<pb4sd-1.2-20030723>
23-Jul-2003: Upgraded package: P<monit-3.2-20030723>
23-Jul-2003: Upgraded package: P<bogofilter-0.14.0-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
