Bläddra i källkod

small bugfixes

Ralf S. Engelschall 22 år sedan
förälder
incheckning
3d40675395
3 ändrade filer med 5 tillägg och 3 borttagningar
  1. 1 1
      cacti/cacti-apache.conf
  2. 1 1
      cacti/cacti-cron.sh
  3. 3 1
      cacti/cacti.spec

+ 1 - 1
cacti/cacti-apache.conf

@@ -80,7 +80,7 @@ BrowserMatch "JDK/1\.0"        force-response-1.0
 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

+ 1 - 1
cacti/cacti-cron.sh

@@ -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

+ 3 - 1
cacti/cacti.spec

@@ -96,6 +96,9 @@ AutoReqProv:  no
     %{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 @@ AutoReqProv:  no
           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"