From 54efba3b5424ccbdee71c4a0fdf2c90f4b3dc5ae Mon Sep 17 00:00:00 2001 From: Christoph Schug Date: Thu, 8 Jan 2004 15:55:33 +0000 Subject: [PATCH] several fixes --- delegate/delegate.spec | 48 +++++++++++++++++++++++++++++++++++++----- delegate/delegated.cf | 6 ++++++ delegate/rc.delegate | 23 +++++++------------- 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 delegate/delegated.cf diff --git a/delegate/delegate.spec b/delegate/delegate.spec index 61e0477db1..8e539979eb 100644 --- a/delegate/delegate.spec +++ b/delegate/delegate.spec @@ -31,13 +31,14 @@ Vendor: Yutaka Sato Packager: The OpenPKG Project Distribution: OpenPKG [BASE] Group: Network -License: GPL +License: Freely distributable Version: 8.7.8 -Release: 20031130 +Release: 20040108 # list of sources Source0: ftp://ftp:openpkg-dev%40openpkg.org@ftp.delegate.org/pub/DeleGate/delegate%{version}.tar.gz Source1: rc.delegate +Source2: delegated.cf # build information Prefix: %{l_prefix} @@ -59,6 +60,23 @@ AutoReqProv: no %prep %setup -q -n delegate%{version} + %{l_shtool} subst \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_OWNER[ ]\{1,\}=\).*$;\1 "%{l_rusr}/%{l_rgrp}"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_ETCDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/etc/delegate"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_CONFIG[ ]\{1,\}=\).*$;\1 "%{l_prefix}/etc/delegate/delegated.cf"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_DGROOT[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_VARDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_ACTDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/act"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_PIDFILE[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/delegate.pid"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_LOGDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_ABORTLOG[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/abort.log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_LOGFILE[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/common.log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_ERRORLOG[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/error.log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_PROTOLOG[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/proto.log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_TRACELOG[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/trace.log"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_WORKDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/work"\;;' \ + -e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_TMPDIR[ ]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/tmp"\;;' \ + src/conf.c %build ( %{l_shtool} echo -e "ADMIN = %u@%h%d" @@ -69,23 +87,43 @@ AutoReqProv: no %install rm -rf $RPM_BUILD_ROOT + + # install DeleGate files %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/etc/delegate \ $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} mkdir -f -p -m 700 \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/act \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/adm \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/cache \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/log \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/work \ + $RPM_BUILD_ROOT%{l_prefix}/var/delegate/tmp %{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 default configuration + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + %{SOURCE delegated.cf} $RPM_BUILD_ROOT%{l_prefix}/etc/delegate/ + # 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} + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ + '%config %{l_prefix}/etc/delegate/*' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/act' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/adm' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/cache' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/log' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/work' \ + '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/delegate/tmp' %files -f files diff --git a/delegate/delegated.cf b/delegate/delegated.cf new file mode 100644 index 0000000000..d667c5d31c --- /dev/null +++ b/delegate/delegated.cf @@ -0,0 +1,6 @@ +## +## @l_prefix@/etc/delegate/delegated.cf -- DeleGate configuration file +## + +ADMIN=root@example.com + diff --git a/delegate/rc.delegate b/delegate/rc.delegate index 45bf7fa2ac..30798da2b2 100644 --- a/delegate/rc.delegate +++ b/delegate/rc.delegate @@ -5,7 +5,6 @@ %config delegate_enable="$openpkg_rc_def" - delegate_params="" delegate_bind="127.0.0.1" delegate_port="8080" delegate_log_prolog="true" @@ -22,21 +21,14 @@ 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 + +=@l_prefix@/etc/delegate/delegated.cf } delegate_stop () { delegate_signal TERM rm -f $delegate_pidfile 2>/dev/null || true } -%status -u @l_susr@ -o +%status -u @l_rusr@ -o delegate_usable="unknown" delegate_active="no" rcService delegate enable yes && \ @@ -45,17 +37,17 @@ echo "delegate_usable=\"$delegate_usable\"" echo "delegate_active=\"$delegate_active\"" -%start -u @l_susr@ +%start -u @l_rusr@ rcService delegate enable yes || exit 0 rcService delegate active yes && exit 0 delegate_start -%stop -u @l_susr@ +%stop -u @l_rusr@ rcService delegate enable yes || exit 0 rcService delegate active no && exit 0 delegate_stop -%restart -u @l_susr@ +%restart -u @l_rusr@ rcService delegate enable yes || exit 0 rcService delegate active no && exit 0 rc delegate stop start @@ -66,11 +58,12 @@ # 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@ \ + -z ${delegate_log_complevel} -m 644 -o @l_rusr@ -g @l_rgrp@ \ -P "${delegate_log_prolog}" \ -E "${delegate_log_epilog} && rc delegate restart" \ + @l_prefix@/var/delegate/abort.log" \ @l_prefix@/var/delegate/common.log" \ - @l_prefix@/var/delegate/proto.log" \ @l_prefix@/var/delegate/error.log" \ + @l_prefix@/var/delegate/proto.log" \ @l_prefix@/var/delegate/trace.log"