[prev in list] [next in list] [prev in thread] [next in thread]
List: openpkg-cvs
Subject: [CVS] OpenPKG: openpkg-src/webmin/ rc.webmin webmin.spec
From: "Michael Schloh" <ms () openpkg ! org>
Date: 2004-07-29 11:12:25
Message-ID: 20040729111225.0CEE13046B7 () mail ! openpkg ! org
[Download RAW message or body]
OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: ms@openpkg.org
Module: openpkg-src Date: 29-Jul-2004 13:12:24
Branch: HEAD Handle: 2004072912122400
Added files:
openpkg-src/webmin rc.webmin
Modified files:
openpkg-src/webmin webmin.spec
Log:
correct substitution quote format, add runcommand file, remove
misleading uninstall.sh file, and tag config files
Summary:
Revision Changes Path
1.1 +77 -0 openpkg-src/webmin/rc.webmin
1.5 +32 -4 openpkg-src/webmin/webmin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/webmin/rc.webmin
============================================================================
$ cvs diff -u -r0 -r1.1 rc.webmin
--- /dev/null 2004-07-29 13:12:24 +0200
+++ rc.webmin 2004-07-29 13:12:24 +0200
@@ -0,0 +1,77 @@
+#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.webmin -- Run-Commands
+##
+
+%config
+ webmin_enable="$openpkg_rc_def"
+ webmin_log_file="@l_prefix@/var/webmin/miniserv.log"
+ webmin_log_prolog="true"
+ webmin_log_epilog="true"
+ webmin_log_numfiles="10"
+ webmin_log_minsize="1M"
+ webmin_log_complevel="9"
+ webmin_err_file="@l_prefix@/var/webmin/miniserv.error"
+ webmin_err_prolog="true"
+ webmin_err_epilog="true"
+ webmin_err_numfiles="10"
+ webmin_err_minsize="1M"
+ webmin_err_complevel="9"
+
+%common
+ webmin_pidfile="@l_prefix@/var/webmin/miniserv.pid"
+ webmin_signal () {
+ [ -f $webmin_pidfile ] && kill -$1 `cat $webmin_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ webmin_usable="unknown"
+ webmin_active="no"
+ rcService webmin enable yes && \
+ webmin_signal 0 && webmin_active="yes"
+ echo "webmin_enable=\"$webmin_enable\""
+ echo "webmin_usable=\"$webmin_usable\""
+ echo "webmin_active=\"$webmin_active\""
+
+%start -u @l_susr@
+ rcService webmin enable yes || exit 0
+ rcService webmin active yes && exit 0
+ PERLLIB=@l_prefix@/lib/webmin
+ export PERLLIB
+ exec '@l_prefix@/lib/webmin/miniserv.pl' @l_prefix@/etc/webmin/miniserv.conf
+
+%stop -u @l_susr@
+ rcService webmin enable yes || exit 0
+ rcService webmin active no && exit 0
+ webmin_signal TERM
+ sleep 2
+ rm -f $ucarp_pidfile 2>/dev/null || true
+
+%restart -u @l_susr@
+ rcService webmin enable yes || exit 0
+ rcService webmin active no && exit 0
+ rc webmin stop start
+
+%daily -u @l_susr@
+ rcService webmin enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${webmin_log_numfiles} -s ${webmin_log_minsize} -d \
+ -z ${webmin_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
+ -P "${webmin_log_prolog}" \
+ -E "${webmin_log_epilog}; echo 1 >$hintfile" \
+ ${webmin_log_file}
+ shtool rotate -f \
+ -n ${webmin_err_numfiles} -s ${webmin_err_minsize} -d \
+ -z ${webmin_err_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
+ -P "${webmin_err_prolog}" \
+ -E "${webmin_err_epilog}; echo 1 >$hintfile" \
+ ${webmin_err_file}
+ if [ -s $hintfile ]; then
+ rc webmin restart
+ fi
+ rcTmp -k
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/webmin/webmin.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 webmin.spec
--- openpkg-src/webmin/webmin.spec 28 Jul 2004 13:19:37 -0000 1.4
+++ openpkg-src/webmin/webmin.spec 29 Jul 2004 11:12:24 -0000 1.5
@@ -34,10 +34,11 @@
Group: Web
License: BSD-style
Version: 1.150
-Release: 20040728
+Release: 20040729
# list of sources
Source0: http://osdn.dl.sourceforge.net/sourceforge/webadmin/webmin-%{version}.tar.gz
+Source1: rc.webmin
# build information
Prefix: %{l_prefix}
@@ -82,8 +83,9 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/webmin \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/webmin \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/webmin \
$RPM_BUILD_ROOT%{l_prefix}/var/webmin
install_dir=$RPM_BUILD_ROOT%{l_prefix}/lib/webmin
config_dir=$RPM_BUILD_ROOT%{l_prefix}/etc/webmin
@@ -101,14 +103,40 @@
export config_dir var_dir upgrading perl port login \
password password2 ssl atboot nostart nochown
./setup.sh $install_dir 2>&1 >/dev/null
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/webmin/uninstall.sh
%{l_shtool} subst \
- -e 's;$RPM_BUILD_ROOT;;g' \
+ -e "s;$RPM_BUILD_ROOT;;g" \
$RPM_BUILD_ROOT%{l_prefix}/etc/webmin/* \
>/dev/null 2>&1
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE rc.webmin} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%config `find %{l_prefix}/etc/webmin/ -type d -exec find {} \;`' \
+ '%config %{l_prefix}/etc/webmin/admin.acl' \
+ '%config %{l_prefix}/etc/webmin/config' \
+ '%config %{l_prefix}/etc/webmin/miniserv.conf' \
+ '%config %{l_prefix}/etc/webmin/miniserv.pem' \
+ '%config %{l_prefix}/etc/webmin/miniserv.users' \
+ '%config %{l_prefix}/etc/webmin/webmin.acl'
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} webmin status 2>/dev/null`
+ [ ".$webmin_active" = .yes ] && %{l_rc} webmin restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} webmin stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/webmin/*.log >/dev/null 2>&1 || true
+ exit 0
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic