packages: cacti-template-mysql/paths.patch - adjusted to 1.1.8

[marti]

Author: marti                        Date: Wed May 25 10:25:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted to 1.1.8

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

---- Diffs:

================================================================
Index: packages/cacti-template-mysql/paths.patch
diff -u packages/cacti-template-mysql/paths.patch:1.2 packages/cacti-template-mysql/paths.patch:1.3
--- packages/cacti-template-mysql/paths.patch:1.2	Wed Feb 16 12:19:05 2011
+++ packages/cacti-template-mysql/paths.patch	Wed May 25 12:25:34 2011
@@ -1,25 +1,30 @@
---- better-cacti-templates-1.1.7/scripts/ss_get_mysql_stats.php~	2010-12-14 01:25:19.000000000 +0200
-+++ better-cacti-templates-1.1.7/scripts/ss_get_mysql_stats.php	2010-12-14 01:25:48.490894371 +0200
-@@ -46,7 +46,7 @@
- $mysql_ssl  = FALSE;   # Whether to use SSL to connect to MySQL.
- 
- $heartbeat  = '';      # db.tbl in case you use mk-heartbeat from Maatkit.
--$cache_dir  = '/tmp';  # If set, this uses caching to avoid multiple calls.
-+$cache_dir  = '/var/cache/cacti';  # If set, this uses caching to avoid multiple calls.
- $poll_time  = 300;     # Adjust to match your polling interval.
- $chk_options = array (
-    'innodb' => true,    # Do you want to check InnoDB statistics?
---- better-cacti-templates-1.1.7/scripts/ss_get_by_ssh.php~	2010-04-21 01:38:48.000000000 +0300
-+++ better-cacti-templates-1.1.7/scripts/ss_get_by_ssh.php	2010-12-14 01:26:36.687535074 +0200
-@@ -38,9 +38,9 @@
+diff -ur better-cacti-templates-1.1.8-orig/scripts/ss_get_by_ssh.php better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php
+--- better-cacti-templates-1.1.8-orig/scripts/ss_get_by_ssh.php	2011-05-25 12:17:25.693298481 +0200
++++ better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php	2011-05-25 12:23:51.021048978 +0200
+@@ -38,10 +38,10 @@
  # ============================================================================
  $ssh_user   = 'cacti';                          # SSH username
  $ssh_port   = 22;                               # SSH port
 -$ssh_iden   = '-i /var/www/cacti/.ssh/id_rsa';  # SSH identity
 +$ssh_iden   = '-i /var/lib/cacti/.ssh/id_rsa';  # SSH identity
  $ssh_tout   = 10;                               # SSH connect timeout
+ $nc_cmd     = 'nc -C -q1';                      # How to invoke netcat
 -$cache_dir  = '/tmp';  # If set, this uses caching to avoid multiple calls.
-+$cache_dir  = '/var/cache/cacti/mysql_stats';  # If set, this uses caching to avoid multiple calls.
++$cache_dir  = '/var/cache/cacti/mysql_stats';   # If set, this uses caching to avoid multiple calls.
  $poll_time  = 300; # Adjust to match your polling interval.
  $use_ss     = FALSE; # Whether to use the script server or not
  $use_ssh    = TRUE;  # Whether to connect via SSH or not (default yes).
+Tylko w better-cacti-templates-1.1.8/scripts: ss_get_by_ssh.php~
+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:22:36.747629448 +0200
+@@ -46,7 +46,7 @@
+ $mysql_ssl  = FALSE;   # Whether to use SSL to connect to MySQL.
+ 
+ $heartbeat  = '';      # db.tbl in case you use mk-heartbeat from Maatkit.
+-$cache_dir  = '/tmp';  # If set, this uses caching to avoid multiple calls.
++$cache_dir  = '/var/cache/cacti';  # If set, this uses caching to avoid multiple calls.
+ $poll_time  = 300;     # Adjust to match your polling interval.
+ $chk_options = array (
+    'innodb'  => true,    # Do you want to check InnoDB statistics?
+Tylko w better-cacti-templates-1.1.8/scripts: ss_get_mysql_stats.php~
================================================================

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