OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2002 15:24:13
Branch: HEAD Handle: 2002090514241300
Modified files:
openpkg-src/imapd imapd.conf imapd.spec rc.imapd
Log:
Fixes and improvements.
Summary:
Revision Changes Path
1.2 +1 -0 openpkg-src/imapd/imapd.conf
1.36 +2 -3 openpkg-src/imapd/imapd.spec
1.2 +8 -5 openpkg-src/imapd/rc.imapd
____________________________________________________________________________
Index: openpkg-src/imapd/imapd.conf
============================================================
$ cvs diff -u -r1.1 -r1.2 imapd.conf
--- openpkg-src/imapd/imapd.conf 5 Sep 2002 06:40:15 -0000 1.1
+++ openpkg-src/imapd/imapd.conf 5 Sep 2002 13:24:13 -0000 1.2
@@ -3,6 +3,7 @@
## Copyright (c) 2002 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
+# Warning: Do not use a trailing slash in paths!
configdirectory: @l_prefix@/var/imapd
partition-default: @l_prefix@/var/spool/imap
admins: @l_musr@
Index: openpkg-src/imapd/imapd.spec
============================================================
$ cvs diff -u -r1.35 -r1.36 imapd.spec
--- openpkg-src/imapd/imapd.spec 5 Sep 2002 06:40:15 -0000 1.35
+++ openpkg-src/imapd/imapd.spec 5 Sep 2002 13:24:13 -0000 1.36
@@ -114,15 +114,14 @@
# install the run command file
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# use mkimap to create many directories for us
cp $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/imapd.conf imapd.conf.hack
%{l_shtool} subst -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};" \
imapd.conf.hack
- %{l_shtool} subst -e "s;/etc/imapd.conf;imapd.conf.hack;" \
- tools/mkimap
- tools/mkimap
+ tools/mkimap imapd.conf.hack
# determine files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
Index: openpkg-src/imapd/rc.imapd
============================================================
$ cvs diff -u -r1.1 -r1.2 rc.imapd
--- openpkg-src/imapd/rc.imapd 5 Sep 2002 06:40:15 -0000 1.1
+++ openpkg-src/imapd/rc.imapd 5 Sep 2002 13:24:13 -0000 1.2
@@ -1,33 +1,36 @@
#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
##
-## rc.imapd -- Run-Commands for IMAP daemon
+## rc.imapd -- Run-Commands for IMAP Daemon
##
%config
imapd_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_musr@
if opServiceEnabled imapd; then
@l_prefix@/bin/master &
+ echo $! > @l_prefix@/var/imapd/imapd.pid
fi
-%stop -p 200 -u root
+%stop -p 200 -u @l_musr@
if opServiceEnabled imapd; then
if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
+ rm @l_prefix@/var/imapd/imapd.pid
fi
fi
-%restart -u root
+%restart -u @l_musr@
if opServiceEnabled imapd; then
if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
sleep 2
fi
@l_prefix@/bin/master &
+ echo $! > @l_prefix@/var/imapd/imapd.pid
fi
-%reload -u root
+%reload -u @l_musr@
if opServiceEnabled imapd; then
if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
kill -HUP `cat @l_prefix@/var/imapd/imapd.pid`
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
