Revision: 6209
http://gar.svn.sourceforge.net/gar/?rev=6209&view=rev
Author: j_arndt
Date: 2009-09-06 13:39:10 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
spine: added new default config path, patched configuration file
Modified Paths:
--------------
csw/mgar/pkg/spine/trunk/Makefile
csw/mgar/pkg/spine/trunk/checksums
csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall
csw/mgar/pkg/spine/trunk/files/CSWspine.prototype
Added Paths:
-----------
csw/mgar/pkg/spine/trunk/files/spine.conf.diff
csw/mgar/pkg/spine/trunk/files/spine.h.diff
csw/mgar/pkg/spine/trunk/files/util.c.diff
Modified: csw/mgar/pkg/spine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 12:00:50 UTC (rev 6208)
+++ csw/mgar/pkg/spine/trunk/Makefile 2009-09-06 13:39:10 UTC (rev 6209)
@@ -11,10 +11,13 @@
MASTER_SITES = http://www.cacti.net/downloads/spine/
#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES = cacti-$(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += cswusergroup CSWspine.postinstall
+DISTFILES += cswusergroup CSWspine.postinstall CSWspine.prototype
DISTNAME = cacti-$(GARNAME)-$(GARVERSION)
PATCHFILES += configure.diff
+PATCHFILES += spine.h.diff
+PATCHFILES += util.c.diff
+PATCHFILES += spine.conf.diff
NOISALIST = 1
@@ -39,9 +42,11 @@
SKIPTEST = 1
+EXTRA_LIB += /opt/csw/mysql5/lib/mysql
+
DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/spine
BINDIR = $(DESTDIR)$(BUILD_PREFIX)/bin
-CFGDIR = $(DESTDIR)$(BUILD_PREFIX)/etc
+CFGDIR = $(DESTDIR)/etc$(BUILD_PREFIX)
include gar/category.mk
Modified: csw/mgar/pkg/spine/trunk/checksums
===================================================================
--- csw/mgar/pkg/spine/trunk/checksums 2009-09-06 12:00:50 UTC (rev 6208)
+++ csw/mgar/pkg/spine/trunk/checksums 2009-09-06 13:39:10 UTC (rev 6209)
@@ -1,4 +1,8 @@
-54e3c3f6ca757815ac1cccf78b7a086c download/CSWspine.postinstall
+6c312db77872d0ab0fa66b02774ce066 download/CSWspine.postinstall
+75d4f19e408bbd07fc3205d76841b5e3 download/CSWspine.prototype
99e5bde07fc31d1ed8aa23c59de00417 download/cacti-spine-0.8.7e.tar.gz
2fbbedbfc20811cbc81ddf748ebdb58e download/configure.diff
b762d50320246dc8ce21c20233479231 download/cswusergroup
+e38aac4a5f8c7c3145d45c4d0dba141c download/spine.conf.diff
+cc35553f4bcd9dc4ab961330484a959b download/spine.h.diff
+5e66f551b2d320a3a6b68ce170e9fec7 download/util.c.diff
Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall
===================================================================
--- csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 12:00:50 UTC
(rev 6208)
+++ csw/mgar/pkg/spine/trunk/files/CSWspine.postinstall 2009-09-06 13:39:10 UTC
(rev 6209)
@@ -4,8 +4,12 @@
=======================================================================
-Please check and edit your configuration in /opt/csw/etc/spine.conf !
+To get spine running, follow these steps:
+(1) Check and edit the configuration file /etc/opt/csw/spine.conf
+
+(2) Follow the instructions on http://www.cacti.net/spine_install.php
+
=======================================================================
EOF
Modified: csw/mgar/pkg/spine/trunk/files/CSWspine.prototype
===================================================================
--- csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 12:00:50 UTC
(rev 6208)
+++ csw/mgar/pkg/spine/trunk/files/CSWspine.prototype 2009-09-06 13:39:10 UTC
(rev 6209)
@@ -1,5 +1,5 @@
f none /opt/csw/bin/spine 0755 root bin
-f cswpreserveconf /opt/csw/etc/spine.conf.CSW 0644 root bin
+f cswpreserveconf /etc/opt/csw/spine.conf.CSW 0644 root bin
d none /opt/csw/share/doc/spine 0755 root bin
f none /opt/csw/share/doc/spine/COPYING 0644 root bin
f none /opt/csw/share/doc/spine/ChangeLog 0644 root bin
Added: csw/mgar/pkg/spine/trunk/files/spine.conf.diff
===================================================================
--- csw/mgar/pkg/spine/trunk/files/spine.conf.diff
(rev 0)
+++ csw/mgar/pkg/spine/trunk/files/spine.conf.diff 2009-09-06 13:39:10 UTC
(rev 6209)
@@ -0,0 +1,29 @@
+diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.conf
cacti-spine-0.8.7e/spine.conf
+--- cacti-spine-0.8.7e.orig/spine.conf 2009-06-29 04:03:36.000000000 +0200
++++ cacti-spine-0.8.7e/spine.conf 2009-09-06 15:11:25.880901586 +0200
+@@ -11,7 +11,7 @@
+ # | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ # | GNU General Public License for more details. |
+ # +-------------------------------------------------------------------------+
+-# | spine: a backend data gatherer for Cacti |
++# | spine: a backend data gatherer for Cacti |
+ # +-------------------------------------------------------------------------+
+ # | This poller would not have been possible without: |
+ # | - Larry Adams (current development and enhancements) |
+@@ -25,11 +25,11 @@
+ # | IP Address for Windows |
+ # | DB_Database Database name, typically 'cacti' |
+ # | DB_Port The database port to use |
+-# | DB_User The user to access the database, typically 'cactiuser' |
++# | DB_User The user to access the database, typically 'cacti' |
+ # | DB_Pass The password for the Cacti user |
+ # +-------------------------------------------------------------------------+
+ DB_Host localhost
+ DB_Database cacti
+-DB_User cactiuser
+-DB_Pass cactiuser
+-DB_Port 3306
+\ No newline at end of file
++DB_User cacti
++DB_Pass cacti
++DB_Port 3306
Added: csw/mgar/pkg/spine/trunk/files/spine.h.diff
===================================================================
--- csw/mgar/pkg/spine/trunk/files/spine.h.diff (rev 0)
+++ csw/mgar/pkg/spine/trunk/files/spine.h.diff 2009-09-06 13:39:10 UTC (rev
6209)
@@ -0,0 +1,30 @@
+diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/spine.h
cacti-spine-0.8.7e/spine.h
+--- cacti-spine-0.8.7e.orig/spine.h 2009-06-29 04:03:36.000000000 +0200
++++ cacti-spine-0.8.7e/spine.h 2009-09-06 12:09:46.987245799 +0200
+@@ -135,21 +135,22 @@
+ #define SPINE_FORK 0
+
+ /* locations to search for the config file */
+-#define CONFIG_PATHS 4
++#define CONFIG_PATHS 5
+ #define CONFIG_PATH_1 ""
+ #define CONFIG_PATH_2 "/etc/"
+ #define CONFIG_PATH_3 "/etc/cacti/"
+ #define CONFIG_PATH_4 "../etc/"
++#define CONFIG_PATH_5 "/etc/opt/csw/"
+
+ /* config file defaults */
+ #define DEFAULT_CONF_FILE "spine.conf"
+ #define DEFAULT_THREADS 5
+ #define DEFAULT_DB_HOST "localhost"
+ #define DEFAULT_DB_DB "cacti"
+-#define DEFAULT_DB_USER "cactiuser"
+-#define DEFAULT_DB_PASS "cactiuser"
++#define DEFAULT_DB_USER "cacti"
++#define DEFAULT_DB_PASS "cacti"
+ #define DEFAULT_DB_PORT 3306
+-#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log"
++#define DEFAULT_LOGFILE "/var/opt/csw/cacti/log/cacti.log"
+ #define DEFAULT_TIMEOUT 294000000
+
+ /* threads constants */
Added: csw/mgar/pkg/spine/trunk/files/util.c.diff
===================================================================
--- csw/mgar/pkg/spine/trunk/files/util.c.diff (rev 0)
+++ csw/mgar/pkg/spine/trunk/files/util.c.diff 2009-09-06 13:39:10 UTC (rev
6209)
@@ -0,0 +1,11 @@
+diff --speed-large-files --minimal -Nru cacti-spine-0.8.7e.orig/util.c
cacti-spine-0.8.7e/util.c
+--- cacti-spine-0.8.7e.orig/util.c 2009-06-29 04:03:36.000000000 +0200
++++ cacti-spine-0.8.7e/util.c 2009-09-06 12:30:28.429083179 +0200
+@@ -503,6 +503,7 @@
+ STRNCOPY(config_paths[1], CONFIG_PATH_2);
+ STRNCOPY(config_paths[2], CONFIG_PATH_3);
+ STRNCOPY(config_paths[3], CONFIG_PATH_4);
++ STRNCOPY(config_paths[4], CONFIG_PATH_5);
+
+ set.log_destination = LOGDEST_FILE;
+ }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
