OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Aug-2006 02:33:54
Branch: HEAD Handle: 2006080301335300
Added files:
openpkg-src/openpkg-registry
rc.openpkg-registry
Modified files:
openpkg-src/openpkg-registry
openpkg-registry.spec
Log:
feature new registry-db utility; add man page and automatic backup
capability
Summary:
Revision Changes Path
1.22 +27 -22 openpkg-src/openpkg-registry/openpkg-registry.spec
1.1 +63 -0 openpkg-src/openpkg-registry/rc.openpkg-registry
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-registry/openpkg-registry.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 openpkg-registry.spec
--- openpkg-src/openpkg-registry/openpkg-registry.spec 25 Jul 2006
13:43:09 -0000 1.21
+++ openpkg-src/openpkg-registry/openpkg-registry.spec 3 Aug 2006
00:33:53 -0000 1.22
@@ -32,8 +32,8 @@
Class: EVAL
Group: Bootstrapping
License: BSD-style
-Version: 0.6.3
-Release: 20060725
+Version: 0.6.5
+Release: 20060803
# package options
%option with_client yes
@@ -41,6 +41,7 @@
# list of sources
Source0:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{version}.tar.gz
+Source1: rc.openpkg-registry
Patch0: openpkg-registry.patch
# build information
@@ -99,37 +100,41 @@
%endif
%if "%{with_server}" == "yes"
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg-registry \
$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg-registry \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/cgi/openpkg-registry \
$RPM_BUILD_ROOT%{l_prefix}/var/openpkg-registry/db \
- $RPM_BUILD_ROOT%{l_prefix}/var/openpkg-registry/ui
+ $RPM_BUILD_ROOT%{l_prefix}/var/openpkg-registry/ui \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- registry-ui.pl \
- $RPM_BUILD_ROOT%{l_prefix}/cgi/openpkg-registry/
+ registry.pm \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg-registry/
+ %{l_shtool} install -c -m 640 %{l_value -s -a} \
+ registry.cfg \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg-registry/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
registry-db.pl \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/openpkg-registry-setup
- ( echo "##"
- echo "## registry-ui.cfg - OpenPKG Registry User Interface
Configuration"
- echo "##"
- echo "## Run ( cd %{l_prefix}/cgi/openpkg-registry &&
./registry-ui.pl )"
- echo "## to review defaults in OSSP cfg syntax. This file has exactly
the same syntax."
- echo "## Only overrides need to be placed here, missing config
directives remain default."
- echo "##"
- ) >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg-registry/registry-ui.cfg
- # FIXME development, also causes "( cd && ./ ...)" construct few lines
above
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/registry-db
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- ase.pm \
+ registry-ui.pl ase.pm \
$RPM_BUILD_ROOT%{l_prefix}/cgi/openpkg-registry/
+ %{l_shtool} install -c -m 644 \
+ *.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+
+ # 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.openpkg-registry} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
%endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
%if "%{with_server}" == "yes"
'%attr(700,%{l_rusr},%{l_rgrp}) %dir
%{l_prefix}/var/openpkg-registry/db' \
'%attr(775,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/var/openpkg-registry/ui' \
- '%attr(640,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
- '%config %{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
+ '%attr(640,%{l_musr},%{l_ngrp}) %config
%{l_prefix}/etc/openpkg-registry/registry.cfg' \
%endif
'%ghost %{l_prefix}/etc/openpkg/register.util' \
'%ghost %{l_prefix}/etc/openpkg/register.tran' \
@@ -147,9 +152,9 @@
# display final hints on initial installation
( echo "1. To complete this installation of OpenPKG Registry please
configure it,"
echo " start PostgreSQL and initialize the OpenPKG Registry
database like this:"
- echo " \$ vi
$RPM_INSTALL_PREFIX/etc/openpkg-registry/registry-ui.cfg"
+ echo " \$ vi
$RPM_INSTALL_PREFIX/etc/openpkg-registry/registry.cfg"
echo " # $RPM_INSTALL_PREFIX/etc/rc postgresql start"
- echo " \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup"
+ echo " \$ $RPM_INSTALL_PREFIX/sbin/registry-db setup"
echo ""
echo "2. After this postinstallation, adjust config and start
Apache like this:"
echo " # vi $RPM_INSTALL_PREFIX/etc/apache/apache.conf"
@@ -161,7 +166,7 @@
if [ $1 -eq 2 ]; then
# display final hints on update installation
( echo "Please perform an OpenPKG Registry database upgrade by
running"
- echo " \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup"
+ echo " \$ $RPM_INSTALL_PREFIX/sbin/registry-db setup"
) | %{l_rpmtool} msg -b -t notice
fi
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-registry/rc.openpkg-registry
============================================================================
$ cvs diff -u -r0 -r1.1 rc.openpkg-registry
--- /dev/null 2006-08-03 02:33:52 +0200
+++ rc.openpkg-registry 2006-08-03 02:33:54 +0200
@@ -0,0 +1,63 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.openpkg-registry -- Run-Commands
+##
+
+%config
+ openpkg_registry_enable="$openpkg_rc_def"
+ openpkg_registry_backup_prolog="true"
+ openpkg_registry_backup_epilog="true"
+ openpkg_registry_backup_numfiles="10"
+ openpkg_registry_backup_complevel="9"
+
+%common
+ [EMAIL PROTECTED]@/sbin/registry-db --query=/db/registry/dumpfile effcfg`
+
+%status -u @l_susr@ -o
+ openpkg_registry_usable="unknown"
+ openpkg_registry_active="no"
+ echo "openpkg_registry_enable=\"$openpkg_registry_enable\""
+ echo "openpkg_registry_usable=\"$openpkg_registry_usable\""
+ echo "openpkg_registry_active=\"$openpkg_registry_active\""
+
+%daily -u @l_susr@
+ rcService openpkg_registry enable yes || exit 0
+
+ # create backup
+ shtool install -c -m 640 -o @l_musr@ -g @l_rgrp@ \
+ /dev/null $openpkg_registry_dumpfile
+ @l_prefix@/sbin/registry-db backup || exit 1
+ cp -p $openpkg_registry_dumpfile $openpkg_registry_dumpfile-daily
+ cp -p $openpkg_registry_dumpfile $openpkg_registry_dumpfile-weekly
+ cp -p $openpkg_registry_dumpfile $openpkg_registry_dumpfile-monthly
+
+ # rotate backup files
+ shtool rotate -f \
+ -n ${openpkg_registry_backup_numfiles} -s 1 -d \
+ -z ${openpkg_registry_backup_complevel} -m 640 -o @l_musr@ -g
@l_rgrp@ \
+ -P "$openpkg_registry_backup_prolog" \
+ -E "$openpkg_registry_backup_epilog" \
+ $openpkg_registry_dumpfile-daily
+
+%weekly -u @l_susr@
+ rcService openpkg_registry enable yes || exit 0
+
+ # rotate backup files
+ shtool rotate -f \
+ -n ${openpkg_registry_backup_numfiles} -s 1 -d \
+ -z ${openpkg_registry_backup_complevel} -m 640 -o @l_musr@ -g
@l_rgrp@ \
+ -P "$openpkg_registry_backup_prolog" \
+ -E "$openpkg_registry_backup_epilog" \
+ $openpkg_registry_dumpfile-weekly
+
+%monthly -u @l_susr@
+ rcService openpkg_registry enable yes || exit 0
+
+ # rotate backup files
+ shtool rotate -f \
+ -n ${openpkg_registry_backup_numfiles} -s 1 -d \
+ -z ${openpkg_registry_backup_complevel} -m 640 -o @l_musr@ -g
@l_rgrp@ \
+ -P "$openpkg_registry_backup_prolog" \
+ -E "$openpkg_registry_backup_epilog" \
+ $openpkg_registry_dumpfile-monthly
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
