- use exec to avoid /bin/sh in process table

[packages/cacti.git] / cacti-config.patch

diff --git a/cacti-config.patch b/cacti-config.patch
index 0fdbd14aa53d7d6845b89c436a1c6df5666fba05..394362eb53d433f8897cd765e31ad773ce1661de 100644 (file)
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -5,7 +5,7 @@
  $config["library_path"] = ereg_replace("(.*[\/\\])include", "\\1lib", dirname(__FILE__));
  $config["include_path"] = dirname(__FILE__);
 -$config["rra_path"] = $config["base_path"] . '/rra';
-+$config["rra_path"] = '/var/lib/cacti/rra'
++$config["rra_path"] = '/var/lib/cacti/rra';
 +$config["log_path"] = '/var/log/cacti';
  
  /* colors */
@@ -16,7 +16,7 @@
  $database_password = "cactiuser";
  $database_port = "3306";
  
-+include '/etc/cacti/cacti.cfg';
++include '/etc/webapps/cacti/config.php';
 +
  /* Default session name - Session name must contain alpha characters */
  #$cacti_session_name = "Cacti";
@@ -89,3 +89,19 @@
        }
  
        html_start_box("<strong>Clear Cacti Log File</strong>", "100%", $colors["header"], "1", "center", "");
+--- cacti/poller.php~  2008-10-05 05:08:10.000000000 +0300
++++ cacti/poller.php   2008-10-05 05:11:11.327705168 +0300
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ /*
+  +-------------------------------------------------------------------------+
+@@ -32,7 +32,7 @@
+ $no_http_headers = true;
+ 
+ /* start initialization section */
+-include(dirname(__FILE__) . "/include/global.php");
++require "/usr/share/cacti/include/global.php";
+ include_once($config["base_path"] . "/lib/poller.php");
+ include_once($config["base_path"] . "/lib/data_query.php");
+ include_once($config["base_path"] . "/lib/graph_export.php");