OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jul-2003 22:24:48
Branch: HEAD Handle: 2003072821244601
Added files:
openpkg-src/delegate rc.delegate
Modified files:
openpkg-src/delegate delegate.spec
openpkg-web news.txt
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.52 +25 -1 openpkg-src/delegate/delegate.spec
1.1 +76 -0 openpkg-src/delegate/rc.delegate
1.5883 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/delegate.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 delegate.spec
--- openpkg-src/delegate/delegate.spec 25 Jul 2003 07:05:16 -0000 1.51
+++ openpkg-src/delegate/delegate.spec 28 Jul 2003 20:24:47 -0000 1.52
@@ -33,10 +33,11 @@
Group: Network
License: GPL
Version: 8.5.8
-Release: 20030725
+Release: 20030728
# list of sources
Source0: ftp://ftp:[EMAIL PROTECTED]/pub/DeleGate/delegate%{version}.tar.gz
+Source1: rc.delegate
# build information
Prefix: %{l_prefix}
@@ -70,15 +71,38 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
+ $RPM_BUILD_ROOT%{l_prefix}/var/delegate \
+ $RPM_BUILD_ROOT%{l_prefix}/var/delegate/cache \
$RPM_BUILD_ROOT%{l_prefix}/share/delegate
%{l_shtool} install -c -s -m 755 \
src/delegated $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 644 \
doc/Manual.htm $RPM_BUILD_ROOT%{l_prefix}/share/delegate/manual.html
+
+ # install run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE rc.delegate} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} delegate status 2>/dev/null`
+ [ ".$delegate_active" = .yes ] && %{l_rc} delegate restart
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} delegate stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/delegate/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/rc.delegate
============================================================================
$ cvs diff -u -r0 -r1.1 rc.delegate
--- /dev/null 2003-07-28 22:24:48.000000000 +0200
+++ rc.delegate 2003-07-28 22:24:48.000000000 +0200
@@ -0,0 +1,76 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.delegate -- Run-Commands
+##
+
+%config
+ delegate_enable="$openpkg_rc_def"
+ delegate_params=""
+ delegate_bind="127.0.0.1"
+ delegate_port="8080"
+ delegate_log_prolog="true"
+ delegate_log_epilog="true"
+ delegate_log_numfiles="10"
+ delegate_log_minsize="1M"
+ delegate_log_complevel="9"
+
+%common
+ delegate_pidfile="@l_prefix@/var/delegate/delegate.pid"
+ delegate_signal () {
+ [ -f $delegate_pidfile ] && kill -$1 `cat $delegate_pidfile`
+ }
+ delegate_start () {
+ @l_prefix@/sbin/delegated \
+ -P${delegate_bind}${delegate_bind:+:}${delegate_port:-8080} \
+ OWNER="@l_musr@/@l_mgrp@" \
+ DGROOT="@l_prefix@/var/delegate" \
+ LOGDIR="@l_prefix@/var/delegate" \
+ LOGFILE="common.log" \
+ PROTOLOG="proto.log" \
+ ERRORLOG="error.log" \
+ TRACELOG="trace.log" \
+ PIDFILE=$delegate_pidfile $delegate_params
+ }
+ delegate_stop () {
+ delegate_signal TERM
+ rm -f $delegate_pidfile 2>/dev/null || true
+ }
+
+%status -u @l_susr@ -o
+ delegate_usable="unknown"
+ delegate_active="no"
+ rcService delegate enable yes && \
+ delegate_signal 0 && delegate_active="yes"
+ echo "delegate_enable=\"$delegate_enable\""
+ echo "delegate_usable=\"$delegate_usable\""
+ echo "delegate_active=\"$delegate_active\""
+
+%start -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active yes && exit 0
+ delegate_start
+
+%stop -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active no && exit 0
+ delegate_stop
+
+%restart -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active no && exit 0
+ rc delegate stop start
+
+%daily -u @l_susr@
+ rcService delegate enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${delegate_log_numfiles} -s ${delegate_log_minsize} -d \
+ -z ${delegate_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
+ -P "${delegate_log_prolog}" \
+ -E "${delegate_log_epilog} && rc delegate restart" \
+ @l_prefix@/var/delegate/common.log" \
+ @l_prefix@/var/delegate/proto.log" \
+ @l_prefix@/var/delegate/error.log" \
+ @l_prefix@/var/delegate/trace.log"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5882 -r1.5883 news.txt
--- openpkg-web/news.txt 28 Jul 2003 19:03:17 -0000 1.5882
+++ openpkg-web/news.txt 28 Jul 2003 20:24:46 -0000 1.5883
@@ -1,3 +1,4 @@
+28-Jul-2003: Upgraded package: P<delegate-8.5.8-20030728>
28-Jul-2003: Upgraded package: P<vim-6.2.57-20030728>
28-Jul-2003: Upgraded package: P<samba-2.2.8a-20030728>
28-Jul-2003: Upgraded package: P<nsd-1.2.2-20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
