From 4a8ad59cc858181e5eb4a9fb963686adceba8c43 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C5=82awomir=20Paszkiewicz?= <paszczus@pld-linux.org>
Date: Mon, 15 Nov 2010 09:17:34 +0000
Subject: [PATCH] - REAL use of /etc/webapps/cacti/config.php instead of
 default one

Changed files:
    cacti-config.patch -> 1.9
---
 cacti-config.patch | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/cacti-config.patch b/cacti-config.patch
index 4b45318..d0451f8 100644
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -10,12 +10,28 @@
  
  /* colors */
  $colors["dark_outline"] = "454E53";
---- cacti-0.8.7a.orig/include/config.php	2007-11-17 19:11:52.000000000 +0100
-+++ cacti-0.8.7a/include/config.php	2007-12-04 10:53:28.000000000 +0100
-@@ -30,6 +30,8 @@
+diff -ur cacti-0.8.7g/include/config.php cacti-0.8.7g.new//include/config.php
+--- cacti-0.8.7g/include/config.php     2010-07-10 00:33:46.000000000 +0200
++++ cacti-0.8.7g.new//include/config.php        2010-11-15 10:12:12.503157839 +0100
+@@ -22,7 +22,11 @@
+  +-------------------------------------------------------------------------+
+ */
+
+-/* make sure these values refect your actual database/host/user/password */
++/*
++ * !!! Use /etc/webapps/cacti/config.php instead of this section !!!
++ *
++ * Make sure these values refect your actual database/host/user/password
++
+ $database_type = "mysql";
+ $database_default = "cacti";
+ $database_hostname = "localhost";
+@@ -30,6 +34,10 @@
  $database_password = "cactiuser";
  $database_port = "3306";
- 
+
++ */
++
 +require '/etc/webapps/cacti/config.php';
 +
  /* Default session name - Session name must contain alpha characters */
-- 
2.44.0