packages: cacti-template-mysql/cacti-template-mysql.spec, cacti-template-my...

[glen]

Author: glen                         Date: Mon Dec 13 23:28:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use /var/cache/cacti for caching instead of /tmp

---- Files affected:
packages/cacti-template-mysql:
   cacti-template-mysql.spec (1.1 -> 1.2) , paths.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cacti-template-mysql/cacti-template-mysql.spec
diff -u packages/cacti-template-mysql/cacti-template-mysql.spec:1.1 packages/cacti-template-mysql/cacti-template-mysql.spec:1.2
--- packages/cacti-template-mysql/cacti-template-mysql.spec:1.1	Fri May  7 00:24:51 2010
+++ packages/cacti-template-mysql/cacti-template-mysql.spec	Tue Dec 14 00:28:43 2010
@@ -3,16 +3,17 @@
 Summary:	MySQL cacti templates
 Name:		cacti-template-%{template}
 Version:	1.1.7
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://mysql-cacti-templates.googlecode.com/files/better-cacti-templates-%{version}.tar.gz
 # Source0-md5:	cec81aa5cba180d079122127bde9bae0
 Source1:	config.php
 Patch0:		config.patch
+Patch1:		paths.patch
 URL:		http://code.google.com/p/mysql-cacti-templates/
 BuildRequires:	rpmbuild(macros) >= 1.554
-Requires:	cacti >= 0.8.7e-8
+Requires:	cacti >= 0.8.7g-6
 Conflicts:	cacti-spine < 0.8.7e-3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,6 +29,7 @@
 %prep
 %setup -qn better-cacti-templates-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -35,7 +37,7 @@
 
 # we deliberately are not packaging other templates this project offers:
 # - it's idiotic to graph network services over ssh
-# - the should get their own package to avoid some confusion when searching for
+# - they should get their own package to avoid some confusion when searching for
 #   templates in package repository
 install -p scripts/ss_get_mysql_stats.php $RPM_BUILD_ROOT%{scriptsdir}
 cp -a templates/cacti_host_template_x_mysql_server*.xml \
@@ -61,5 +63,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/12/13 23:28:43  glen
+- use /var/cache/cacti for caching instead of /tmp
+
 Revision 1.1  2010/05/06 22:24:51  glen
 - new

================================================================
Index: packages/cacti-template-mysql/paths.patch
diff -u /dev/null packages/cacti-template-mysql/paths.patch:1.1
--- /dev/null	Tue Dec 14 00:28:49 2010
+++ packages/cacti-template-mysql/paths.patch	Tue Dec 14 00:28:44 2010
@@ -0,0 +1,25 @@
+--- 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 @@
+ # ============================================================================
+ $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
+-$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.
+ $use_ss     = FALSE; # Whether to use the script server or not
+ $use_ssh    = TRUE;  # Whether to connect via SSH or not (default yes).
================================================================

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