[csw-devel] SF.net SVN: gar:[14077] csw/mgar/pkg/munin/trunk

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Tue Apr 5 19:09:52 CEST 2011


Revision: 14077
          http://gar.svn.sourceforge.net/gar/?rev=14077&view=rev
Author:   j_arndt
Date:     2011-04-05 17:09:52 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
munin: added new plugins, minor fixes

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype
    csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2011-04-05 14:29:06 UTC (rev 14076)
+++ csw/mgar/pkg/munin/trunk/Makefile	2011-04-05 17:09:52 UTC (rev 14077)
@@ -13,9 +13,10 @@
 SF_PROJ = munin
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += cswmuninnode
+DISTFILES += CSWmuninnode.prototype
+DISTFILES += CSWmunincommon.prototype
 DISTFILES += CSWmuninmaster.prototype
-DISTFILES += CSWmuninnode.prototype cswmuninnode
-DISTFILES += CSWmunincommon.prototype
 DISTFILES += cswusergroup
 DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW
 DISTFILES += README.CSW
@@ -47,6 +48,8 @@
 ARCHALL_CSWmuninnode = 1
 ARCHALL_CSWmunincommon = 1
 
+RUNTIME_DEP_PKGS_CSWmuincommon = CSWperl
+
 RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon
 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 
 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab CSWcas-postmsg
@@ -56,7 +59,7 @@
 
 RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay
 
-SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles cswpostmsg
+SPKG_CLASSES_CSWmuninmaster = none cswusergroup ugfiles cswcrontab cswcptemplates cswpostmsg
 SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf 
 SPKG_CLASSES_CSWmunincommon = none
 
@@ -107,11 +110,11 @@
 	@# create init script / smf -> cswinitsmf
 	@#
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode
+	@ginstall -m 644 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode
 	@#
 	@# create crontab for user munin -> cswcrontab
 	@#
-	@ginstall -d 755 $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs
+	@ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs
 	@ginstall -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin
 	@#
 	@# print a postmessage -> cswpostmessage

Modified: csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype	2011-04-05 14:29:06 UTC (rev 14076)
+++ csw/mgar/pkg/munin/trunk/files/CSWmunincommon.prototype	2011-04-05 17:09:52 UTC (rev 14077)
@@ -5,6 +5,7 @@
 f none /opt/csw/share/man/man3/Munin::Common::TLSClient.3perl 0444 root bin
 f none /opt/csw/share/man/man3/Munin::Common::TLSServer.3perl 0444 root bin
 f none /opt/csw/share/man/man3/Munin::Common::Timeout.3perl 0444 root bin
+d none /opt/csw/share/perl/site_perl/Munin 0755 root bin
 d none /opt/csw/share/perl/site_perl/Munin/Common 0755 root bin
 f none /opt/csw/share/perl/site_perl/Munin/Common/Config.pm 0444 root bin
 f none /opt/csw/share/perl/site_perl/Munin/Common/Defaults.pm 0444 root bin

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype	2011-04-05 14:29:06 UTC (rev 14076)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype	2011-04-05 17:09:52 UTC (rev 14077)
@@ -50,6 +50,10 @@
 f none /opt/csw/libexec/munin/plugins/foldingathome 0755 root bin
 f none /opt/csw/libexec/munin/plugins/foldingathome_rank 0755 root bin
 f none /opt/csw/libexec/munin/plugins/foldingathome_wu 0755 root bin
+f none /opt/csw/libexec/munin/plugins/freeradius_acct 0755 root bin
+f none /opt/csw/libexec/munin/plugins/freeradius_auth 0755 root bin
+f none /opt/csw/libexec/munin/plugins/freeradius_proxy_acct 0755 root bin
+f none /opt/csw/libexec/munin/plugins/freeradius_proxy_auth 0755 root bin
 f none /opt/csw/libexec/munin/plugins/haproxy_ 0755 root bin
 f none /opt/csw/libexec/munin/plugins/hddtemp 0755 root bin
 f none /opt/csw/libexec/munin/plugins/hddtemp2 0755 root bin
@@ -80,6 +84,7 @@
 f none /opt/csw/libexec/munin/plugins/multigraph_tester 0755 root bin
 f none /opt/csw/libexec/munin/plugins/multiping 0755 root bin
 f none /opt/csw/libexec/munin/plugins/multips 0755 root bin
+f none /opt/csw/libexec/munin/plugins/multips_memory 0755 root bin
 f none /opt/csw/libexec/munin/plugins/munin_stats 0755 root bin
 f none /opt/csw/libexec/munin/plugins/munin_update 0755 root bin
 f none /opt/csw/libexec/munin/plugins/mysql_ 0755 root bin
@@ -110,8 +115,8 @@
 f none /opt/csw/libexec/munin/plugins/paging_out 0755 root bin
 f none /opt/csw/libexec/munin/plugins/perdition 0755 root bin
 f none /opt/csw/libexec/munin/plugins/ping_ 0755 root bin
-f none /opt/csw/libexec/munin/plugins/plugin.sh 0644 root bin
-f none /opt/csw/libexec/munin/plugins/plugins.history 0644 root bin
+f none /opt/csw/libexec/munin/plugins/plugin.sh 0755 root bin
+f none /opt/csw/libexec/munin/plugins/plugins.history 0755 root bin
 f none /opt/csw/libexec/munin/plugins/pm3users_ 0755 root bin
 f none /opt/csw/libexec/munin/plugins/pop_stats 0755 root bin
 f none /opt/csw/libexec/munin/plugins/postfix_mailqueue 0755 root bin
@@ -131,6 +136,7 @@
 f none /opt/csw/libexec/munin/plugins/postgres_users 0755 root bin
 f none /opt/csw/libexec/munin/plugins/postgres_xlog 0755 root bin
 f none /opt/csw/libexec/munin/plugins/processes 0755 root bin
+f none /opt/csw/libexec/munin/plugins/proxy_plugin 0755 root bin
 f none /opt/csw/libexec/munin/plugins/ps_ 0755 root bin
 f none /opt/csw/libexec/munin/plugins/psu_ 0755 root bin
 f none /opt/csw/libexec/munin/plugins/qmailqstat 0755 root bin
@@ -228,8 +234,6 @@
 f none /opt/csw/share/man/man3/Munin::Plugin::SNMP.3perl 0444 root bin
 d none /opt/csw/share/man/man5 0755 root bin
 f none /opt/csw/share/man/man5/munin-node.conf.5 0644 root bin
-d none /opt/csw/share/man/man8 0755 root bin
-f none /opt/csw/share/man/man8/munin.8 0644 root bin
 d none /opt/csw/share/munin 0755 root bin
 d none /opt/csw/share/perl 0755 root bin
 d none /opt/csw/share/perl/site_perl 0755 root bin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list