OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Aug-2003 17:18:31
Branch: HEAD Handle: 2003081916183000
Modified files:
openpkg-src/cacti cacti-apache.conf cacti-cron.sh cacti.spec
Log:
small bugfixes
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-src/cacti/cacti-apache.conf
1.2 +1 -1 openpkg-src/cacti/cacti-cron.sh
1.2 +3 -1 openpkg-src/cacti/cacti.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti-apache.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 cacti-apache.conf
--- openpkg-src/cacti/cacti-apache.conf 19 Aug 2003 14:45:35 -0000 1.1
+++ openpkg-src/cacti/cacti-apache.conf 19 Aug 2003 15:18:30 -0000 1.2
@@ -80,7 +80,7 @@
AddType application/x-httpd-php .php
php_admin_flag register_globals on
php_admin_flag register_argc_argv on
-php_admin_flag safe_mode on
+php_admin_flag safe_mode off
# configure Cacti
RewriteEngine on
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti-cron.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 cacti-cron.sh
--- openpkg-src/cacti/cacti-cron.sh 19 Aug 2003 14:46:02 -0000 1.1
+++ openpkg-src/cacti/cacti-cron.sh 19 Aug 2003 15:18:30 -0000 1.2
@@ -3,7 +3,7 @@
## cacti-cron.sh -- Cacti Cron Job
##
-server=`grep '^Listen' @l_prefix@/etc/cacti/cacti-apache.conf | head -1 | awk '{
print $1; }'`
+server=`grep '^Listen' @l_prefix@/etc/cacti/cacti-apache.conf | head -1 | awk '{
print $2; }'`
@l_prefix@/bin/wget -0 - \
http://$server/cacti/cmd.php \
>/dev/null 2>&1 || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 cacti.spec
--- openpkg-src/cacti/cacti.spec 19 Aug 2003 14:45:35 -0000 1.1
+++ openpkg-src/cacti/cacti.spec 19 Aug 2003 15:18:30 -0000 1.2
@@ -96,6 +96,9 @@
%{l_shtool} subst \
-e 's;docs/;../docs/;g' \
install/index.php
+ %{l_shtool} subst \
+ -e 's;#!/usr/bin/php;#!%{l_prefix}/bin/php;' \
+ cmd.php
# install all files and strip down installation afterwards
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/cacti/
@@ -173,7 +176,6 @@
echo " the following commands:"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc mysql start"
echo " \$ $RPM_INSTALL_PREFIX/sbin/cacti-setup"
- echo " \$ $RPM_INSTALL_PREFIX/etc/rc mysql stop"
echo ""
echo "2. Cacti by default is run by the OpenPKG cron jobs every 15"
echo " minutes only. Usually Cacti wants to run every 5 minutes for"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
