packages: cacti-template-mysql/config.patch - config for ssh script as well

[glen]

Author: glen                         Date: Wed Dec 21 16:40:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- config for ssh script as well

---- Files affected:
packages/cacti-template-mysql:
   config.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/cacti-template-mysql/config.patch
diff -u packages/cacti-template-mysql/config.patch:1.2 packages/cacti-template-mysql/config.patch:1.3
--- packages/cacti-template-mysql/config.patch:1.2	Wed May 25 12:25:56 2011
+++ packages/cacti-template-mysql/config.patch	Wed Dec 21 17:40:15 2011
@@ -1,4 +1,3 @@
-diff -ur better-cacti-templates-1.1.8-orig/scripts/ss_get_mysql_stats.php better-cacti-templates-1.1.8/scripts/ss_get_mysql_stats.php
 --- better-cacti-templates-1.1.8-orig/scripts/ss_get_mysql_stats.php	2011-05-25 12:17:25.659963610 +0200
 +++ better-cacti-templates-1.1.8/scripts/ss_get_mysql_stats.php	2011-05-25 12:19:29.509003208 +0200
 @@ -68,6 +68,10 @@
@@ -12,4 +11,16 @@
  if ( file_exists(__FILE__ . '.cnf' ) ) {
     require(__FILE__ . '.cnf');
  }
-Tylko w better-cacti-templates-1.1.8/scripts: ss_get_mysql_stats.php~
+--- better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php~	2011-12-21 18:26:28.000000000 +0200
++++ better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php	2011-12-21 18:29:47.234354418 +0200
+@@ -66,6 +66,10 @@
+ # ============================================================================
+ # Include settings from an external config file (issue 39).
+ # ============================================================================
++# prefer system location first
++if ( file_exists('/etc/webapps/cacti/ss_get_by_ssh.php') ) {
++   require('/etc/webapps/cacti/ss_get_by_ssh.php');
++}
+ if ( file_exists(__FILE__ . '.cnf' ) ) {
+    require(__FILE__ . '.cnf');
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-mysql/config.patch?r1=1.2&r2=1.3&f=u