[csw-devel] SF.net SVN: gar:[5511] csw/mgar/pkg
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Mon Jul 6 13:00:34 CEST 2009
Revision: 5511
http://gar.svn.sourceforge.net/gar/?rev=5511&view=rev
Author: j_arndt
Date: 2009-07-06 11:00:33 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
munin: Initial commit
Added Paths:
-----------
csw/mgar/pkg/munin/
csw/mgar/pkg/munin/branches/
csw/mgar/pkg/munin/tags/
csw/mgar/pkg/munin/trunk/
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
csw/mgar/pkg/munin/trunk/files/
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.gspec
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
csw/mgar/pkg/munin/trunk/files/CSWmuninnode.gspec
csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
csw/mgar/pkg/munin/trunk/files/apache.conf-sample
csw/mgar/pkg/munin/trunk/files/cswmuninnode
csw/mgar/pkg/munin/trunk/files/cswusergroup
csw/mgar/pkg/munin/trunk/files/makefile.config.diff
csw/mgar/pkg/munin/trunk/files/makefile.diff
csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
Property changes on: csw/mgar/pkg/munin/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/munin/trunk/Makefile 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,75 @@
+GARNAME = munin
+GARVERSION = 1.3.4
+CATEGORIES = apps
+
+SPKG_DESC_CSWmuninmaster = munin master
+SPKG_DESC_CSWmuninnode = munin node
+
+#DESCRIPTION = graphical network and system monitoring
+define BLURB
+ Long description
+endef
+
+SF_PROJ = munin
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz
+DISTFILES += $(call admfiles,CSWmuninmaster, prototype postinstall)
+DISTFILES += $(call admfiles,CSWmuninnode, prototype)
+DISTFILES += cswusergroup
+DISTFILES += apache.conf-sample
+
+PATCHFILES += makefile.diff
+PATCHFILES += makefile.config.diff
+PATCHFILES += sunos_memory.in.diff
+PATCHFILES += munin-node.conf.in.diff
+PATCHFILES += munin.conf.in.diff
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of MASTER_SITES, then
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# UPSTREAM_MASTER_SITES =
+
+REQUIRED_PKGS_CSWmuninmaster = CSWpmnetserver CSWperl CSWpython CSWpmparserecdescent
+REQUIRED_PKGS_CSWmuninmaster = CSWpmhtmltmpl CSWpmdatemanip CSWpmmd5 CSWrrd CSWcswclassutils
+
+REQUIRED_PKGS_CSWmuninnode = CSWpmnetsnmp CSWpmnetserver CSWperl CSWtop CSWcswclassutils
+
+SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles
+SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
+SKIPTEST = 1
+
+ENABLE_CHECK = 0
+
+include gar/category.mk
+
+configure-custom:
+ @$(MAKECOOKIE)
+
+build-custom:
+ @$(MAKECOOKIE)
+
+install-custom:
+ cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp
+ mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config
+ ( cd $(WORKSRC); gmake -f Makefile install)
+ #mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins
+ mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW
+ mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW
+ @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster
+ @ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode
+ @ginstall -d $(DESTDIR)/opt/csw/share/doc
+ @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_master
+ @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup
+ @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup
+ @ginstall -m 644 $(FILEDIR)/apache.conf-sample $(DESTDIR)/opt/csw/share/doc/munin_master/apache.conf-sample
+ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+ @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums (rev 0)
+++ csw/mgar/pkg/munin/trunk/checksums 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,13 @@
+7e6d51878164293b723270d9b0e86348 download/CSWmuninmaster.gspec
+39296b9aff25a2518394811796ef7ae6 download/CSWmuninmaster.postinstall
+02fd772bbd2d52b0931b11de59974d49 download/CSWmuninmaster.prototype
+d6014841b8b2167308026bfe48782fb5 download/CSWmuninnode.gspec
+0265625b33fc397d7c0cba98164662fb download/CSWmuninnode.prototype
+8ebfcd5de8ca86733a047baeae1a18ec download/apache.conf-sample
+50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup
+7f078286bd7be367a4cfe32d0a4b8348 download/makefile.config.diff
+3ea1ba00633ac52c3a25306c3c9c52e0 download/makefile.diff
+ce97aa8e741383039fb365d1a322f3e7 download/munin-node.conf.in.diff
+737e3e3d2f68015dfb4e857909cde7da download/munin.conf.in.diff
+e3a58e582407981d4f5c5aed59cbfc47 download/munin_1.3.4.tar.gz
+43db53191eaae75be35b3548a993c31e download/sunos_memory.in.diff
Added: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.gspec
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.gspec (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.gspec 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,3 @@
+%var bitname munin_master
+%var pkgname CSWmuninmaster
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
Added: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+passwd -N munin
+
+echo
+echo "Please append the following line to the crontab of the user 'munin':"
+echo
+echo " 0,5,10,15,20,25,30,35,40,45,50,55 * * * * /bin/test -x /opt/csw/bin/munin-cron && /opt/csw/bin/munin-cron"
+echo
Added: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,53 @@
+d none /etc/opt/csw/munin 0755 root bin
+f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 munin munin
+f none /opt/csw/bin/munin-check 0755 root bin
+f none /opt/csw/bin/munin-cron 0755 root bin
+f none /opt/csw/lib/munin/VeraMono.ttf 0755 root bin
+f none /opt/csw/lib/munin/munin-graph 0755 root bin
+f none /opt/csw/lib/munin/munin-html 0755 root bin
+f none /opt/csw/lib/munin/munin-limits 0755 root bin
+f none /opt/csw/lib/munin/munin-update 0755 root bin
+d ugfiles /etc/opt/csw/munin/templates 0755 munin munin
+f none /etc/opt/csw/munin/templates/definitions.html 0644 root bin
+f none /etc/opt/csw/munin/templates/logo.png 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-comparison-day.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-comparison-month.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-comparison-week.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-comparison-year.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-domainview.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-nodeview.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-overview.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/munin-serviceview.tmpl 0644 root bin
+f none /etc/opt/csw/munin/templates/style.css 0644 root bin
+d none /opt/csw/share/doc/munin_master 0755 root bin
+f none /opt/csw/share/doc/munin_master/license 0644 root bin
+f none /opt/csw/share/doc/munin_master/apache.conf-sample 0644 root bin
+d none /opt/csw/share/man/man1 0755 root bin
+d none /opt/csw/share/man/man5 0755 root bin
+f none /opt/csw/share/man/man5/munin.conf.5 0644 root bin
+d none /opt/csw/share/man/man8 0755 root bin
+f none /opt/csw/share/man/man8/munin-cron.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-graph.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-html.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-limits.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-update.8 0644 root bin
+d none /opt/csw/share/perl 0755 root bin
+d none /opt/csw/share/perl/site_perl 0755 root bin
+d none /opt/csw/share/perl/site_perl/Munin 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin.pm 0644 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin
+d none /var/opt 0755 root sys
+d none /var/opt/csw 0755 root bin
+d none /var/opt/csw/munin 0755 root bin
+d ugfiles /var/opt/csw/munin/www 0755 munin munin
+f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin
+d ugfiles /var/opt/csw/munin/www/cgi 0755 munin munin
+f ugfiles /var/opt/csw/munin/www/cgi/munin-cgi-graph 0755 munin munin
+f ugfiles /var/opt/csw/munin/www/favicon.ico 0644 munin munin
+d ugfiles /var/opt/csw/munin/db 0755 munin munin
+d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin
+d ugfiles /var/opt/csw/munin/log 0755 munin munin
+d ugfiles /var/opt/csw/munin/run 0755 munin munin
+d none /opt/csw/etc/pkg 0755 root bin
+d none /opt/csw/etc/pkg/CSWmuninmaster 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWmuninmaster/cswusergroup 0644 root bin
Added: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.gspec
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.gspec (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.gspec 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,3 @@
+%var bitname munin_node
+%var pkgname CSWmuninnode
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
Added: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,175 @@
+d none /etc/opt/csw/munin 0755 root bin
+f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 munin munin
+d none /etc/opt/csw/munin/plugin-conf.d 0755 root bin
+d none /etc/opt/csw/munin/plugins 0755 root bin
+f none /opt/csw/bin/munindoc 0755 root bin
+d none /opt/csw/lib/munin/plugins 0755 root bin
+f none /opt/csw/lib/munin/plugins/amavis 0755 root bin
+f none /opt/csw/lib/munin/plugins/apache_accesses 0755 root bin
+f none /opt/csw/lib/munin/plugins/apache_processes 0755 root bin
+f none /opt/csw/lib/munin/plugins/apache_volume 0755 root bin
+f none /opt/csw/lib/munin/plugins/apc_envunit_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/apc_nis 0755 root bin
+f none /opt/csw/lib/munin/plugins/bind9 0755 root bin
+f none /opt/csw/lib/munin/plugins/bind9_rndc 0755 root bin
+f none /opt/csw/lib/munin/plugins/cmc_tc_sensor_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/colour_tester 0755 root bin
+f none /opt/csw/lib/munin/plugins/courier_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/courier_mta_mailqueue 0755 root bin
+f none /opt/csw/lib/munin/plugins/courier_mta_mailstats 0755 root bin
+f none /opt/csw/lib/munin/plugins/courier_mta_mailvolume 0755 root bin
+f none /opt/csw/lib/munin/plugins/cpu 0755 root bin
+f none /opt/csw/lib/munin/plugins/cupsys_pages 0755 root bin
+f none /opt/csw/lib/munin/plugins/df 0755 root bin
+f none /opt/csw/lib/munin/plugins/df_inode 0755 root bin
+f none /opt/csw/lib/munin/plugins/dhcpd3 0755 root bin
+f none /opt/csw/lib/munin/plugins/digitemp_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/exim_mailqueue 0755 root bin
+f none /opt/csw/lib/munin/plugins/exim_mailqueue_alt 0755 root bin
+f none /opt/csw/lib/munin/plugins/exim_mailstats 0755 root bin
+f none /opt/csw/lib/munin/plugins/foldingathome 0755 root bin
+f none /opt/csw/lib/munin/plugins/foldingathome_rank 0755 root bin
+f none /opt/csw/lib/munin/plugins/foldingathome_wu 0755 root bin
+f none /opt/csw/lib/munin/plugins/hddtemp 0755 root bin
+f none /opt/csw/lib/munin/plugins/hddtemp2 0755 root bin
+f none /opt/csw/lib/munin/plugins/hddtemp_smartctl 0755 root bin
+f none /opt/csw/lib/munin/plugins/hddtempd 0755 root bin
+f none /opt/csw/lib/munin/plugins/http_loadtime 0755 root bin
+f none /opt/csw/lib/munin/plugins/if_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/if_errcoll_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/ifx_concurrent_sessions_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/io_busy_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/io_bytes_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/io_ops_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/ipac-ng 0755 root bin
+f none /opt/csw/lib/munin/plugins/ircu 0755 root bin
+f none /opt/csw/lib/munin/plugins/load 0755 root bin
+f none /opt/csw/lib/munin/plugins/loggrep 0755 root bin
+f none /opt/csw/lib/munin/plugins/lpstat 0755 root bin
+f none /opt/csw/lib/munin/plugins/mailman 0755 root bin
+f none /opt/csw/lib/munin/plugins/mailscanner 0755 root bin
+f none /opt/csw/lib/munin/plugins/mbmon_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/memory 0755 root bin
+f none /opt/csw/lib/munin/plugins/mhttping 0755 root bin
+f none /opt/csw/lib/munin/plugins/multiping 0755 root bin
+f none /opt/csw/lib/munin/plugins/multips 0755 root bin
+f none /opt/csw/lib/munin/plugins/munin_stats 0755 root bin
+f none /opt/csw/lib/munin/plugins/mysql_bytes 0755 root bin
+f none /opt/csw/lib/munin/plugins/mysql_isam_space_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/mysql_queries 0755 root bin
+f none /opt/csw/lib/munin/plugins/mysql_slowqueries 0755 root bin
+f none /opt/csw/lib/munin/plugins/mysql_threads 0755 root bin
+f none /opt/csw/lib/munin/plugins/named 0755 root bin
+f none /opt/csw/lib/munin/plugins/netopia 0755 root bin
+f none /opt/csw/lib/munin/plugins/netstat 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_kernel_err 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_kernel_pll_freq 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_kernel_pll_off 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_offset 0755 root bin
+f none /opt/csw/lib/munin/plugins/ntp_states 0755 root bin
+f none /opt/csw/lib/munin/plugins/nut_misc 0755 root bin
+f none /opt/csw/lib/munin/plugins/nut_volts 0755 root bin
+f none /opt/csw/lib/munin/plugins/nutups_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/nvidia_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/paging_in 0755 root bin
+f none /opt/csw/lib/munin/plugins/paging_out 0755 root bin
+f none /opt/csw/lib/munin/plugins/perdition 0755 root bin
+f none /opt/csw/lib/munin/plugins/ping_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/plugin.sh 0644 root bin
+f none /opt/csw/lib/munin/plugins/plugins.history 0644 root bin
+f none /opt/csw/lib/munin/plugins/pm3users_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/pop_stats 0755 root bin
+f none /opt/csw/lib/munin/plugins/postfix_mailqueue 0755 root bin
+f none /opt/csw/lib/munin/plugins/postfix_mailstats 0755 root bin
+f none /opt/csw/lib/munin/plugins/postfix_mailvolume 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_block_read_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_commits 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_commits_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_connections 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_locks 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_queries 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_queries_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/postgres_space_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/processes 0755 root bin
+f none /opt/csw/lib/munin/plugins/ps_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/psu_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/qmailscan 0755 root bin
+f none /opt/csw/lib/munin/plugins/qmailscan-simple 0755 root bin
+f none /opt/csw/lib/munin/plugins/samba 0755 root bin
+f none /opt/csw/lib/munin/plugins/sendmail_mailqueue 0755 root bin
+f none /opt/csw/lib/munin/plugins/sendmail_mailstats 0755 root bin
+f none /opt/csw/lib/munin/plugins/sendmail_mailtraffic 0755 root bin
+f none /opt/csw/lib/munin/plugins/smart_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__cpuload 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__df 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__fc_if_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__fc_if_err_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__if_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__if_err_ 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__load 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__memory 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__netstat 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__processes 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__rdp_users 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_fsc_bx_fan 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_fsc_bx_temp 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_fsc_fan 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_fsc_temp 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_mbm_fan 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_mbm_temp 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__sensors_mbm_volt 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__swap 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__uptime 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__users 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__winload 0755 root bin
+f none /opt/csw/lib/munin/plugins/snmp__winmem 0755 root bin
+f none /opt/csw/lib/munin/plugins/spamstats 0755 root bin
+f none /opt/csw/lib/munin/plugins/squid_cache 0755 root bin
+f none /opt/csw/lib/munin/plugins/squid_icp 0755 root bin
+f none /opt/csw/lib/munin/plugins/squid_objectsize 0755 root bin
+f none /opt/csw/lib/munin/plugins/squid_requests 0755 root bin
+f none /opt/csw/lib/munin/plugins/squid_traffic 0755 root bin
+f none /opt/csw/lib/munin/plugins/surfboard 0755 root bin
+f none /opt/csw/lib/munin/plugins/sybase_space 0755 root bin
+f none /opt/csw/lib/munin/plugins/temperature 0755 root bin
+f none /opt/csw/lib/munin/plugins/tomcat_access 0755 root bin
+f none /opt/csw/lib/munin/plugins/tomcat_jvm 0755 root bin
+f none /opt/csw/lib/munin/plugins/tomcat_threads 0755 root bin
+f none /opt/csw/lib/munin/plugins/tomcat_volume 0755 root bin
+f none /opt/csw/lib/munin/plugins/uptime 0755 root bin
+f none /opt/csw/lib/munin/plugins/users 0755 root bin
+f none /opt/csw/lib/munin/plugins/vmstat 0755 root bin
+f none /opt/csw/sbin/munin-node 0755 root bin
+f none /opt/csw/sbin/munin-node-configure 0755 root bin
+f none /opt/csw/sbin/munin-node-configure-snmp 0755 root bin
+f none /opt/csw/sbin/munin-run 0755 root bin
+d none /opt/csw/share/doc/munin_node 0755 root bin
+f none /opt/csw/share/doc/munin_node/license 0644 root bin
+d none /opt/csw/share/man/man1 0755 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-node-configure-snmp.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-node-configure.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-node.8 0644 root bin
+f none /opt/csw/share/man/man8/munin-run.8 0644 root bin
+d none /opt/csw/share/perl 0755 root bin
+d none /opt/csw/share/perl/site_perl 0755 root bin
+d none /opt/csw/share/perl/site_perl/Munin 0755 root bin
+d none /opt/csw/share/perl/site_perl/Munin/Plugin 0755 root bin
+f none /opt/csw/share/perl/site_perl/Munin/Plugin.pm 0644 root bin
+d none /var/opt/csw/munin 0755 root bin
+s none /etc/opt/csw/munin/plugins/load=/opt/csw/lib/munin/plugins/load
+s none /etc/opt/csw/munin/plugins/uptime=/opt/csw/lib/munin/plugins/uptime
+s none /etc/opt/csw/munin/plugins/cpu=/opt/csw/lib/munin/plugins/cpu
+s none /etc/opt/csw/munin/plugins/df=/opt/csw/lib/munin/plugins/df
+d ugfiles /var/opt/csw/munin/log 0755 munin munin
+d ugfiles /var/opt/csw/munin/run 0755 munin munin
+d ugfiles /var/opt/csw/munin/db 0755 munin munin
+d ugfiles /var/opt/csw/munin/db/plugin-state 0755 munin munin
+d none /opt/csw/etc/pkg 0755 root bin
+d none /opt/csw/etc/pkg/CSWmuninnode 0755 root bin
+d none /etc/opt/csw/init.d 0755 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWmuninnode/cswusergroup 0644 root bin
Added: csw/mgar/pkg/munin/trunk/files/apache.conf-sample
===================================================================
--- csw/mgar/pkg/munin/trunk/files/apache.conf-sample (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/apache.conf-sample 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,28 @@
+# Apache configurations for accessing munin
+
+Alias /munin/ "/var/opt/csw/munin/www/"
+
+<Directory "/var/opt/csw/munin/www/">
+ Options None
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+</Directory>
+
+
+# Apache configuration to support munin-cgi-graph
+#
+# In addition, the Munin log files and html area should be writable
+# to the web server. Therefor add the apache user to the munin group.
+#
+# Documentation for this is in http://munin.projects.linpro.no/wiki/CgiHowto
+
+ScriptAlias /munin/dyn/ /var/opt/csw/munin/www/cgi/
+
+<Directory /var/opt/csw/munin/www/cgi>
+ AllowOverride None
+ Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+</Directory>
+
Added: csw/mgar/pkg/munin/trunk/files/cswmuninnode
===================================================================
--- csw/mgar/pkg/munin/trunk/files/cswmuninnode (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/cswmuninnode 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+# For OpenCSW by Juergen Arndt 2009-07-03
+
+#FMRI application # FMRI path for service
+#AUTOENABLE yes
+
+SMF_EXIT_ERR_CONFIG=1
+
+if [ -f /lib/svc/share/smf_include.sh ]
+then
+ . /lib/svc/share/smf_include.sh
+fi
+
+CONFIG_FILE=/etc/opt/csw/munin/munin-node.conf
+
+if [ ! -f $CONFIG_FILE ]
+then
+ exit $SMF_EXIT_ERR_CONFIG
+fi
+
+BIN_FILE="/opt/csw/sbin/munin-node"
+pidfile=`awk -F' ' '/^[ \t]*pid_file/ {print $2}' $CONFIG_FILE`
+munin_user=`awk -F' ' '/^[ \t]*user/ {print $2}' $CONFIG_FILE`
+
+start_munin_node ()
+{
+ if [ -f $CONFIG_FILE ]; then
+ wait 1
+ $BIN_FILE -c $CONFIG_FILE -d
+ fi
+}
+
+stop_munin_node ()
+{
+ /usr/bin/kill `head -1 $pidfile`
+}
+
+case "$1" in
+'restart')
+ stop_munin_node
+ start_munin_node
+ ;;
+
+'start')
+ start_munin_node
+ ;;
+'stop')
+ stop_munin_node
+ ;;
+
+*)
+ echo "Usage: $0 { start | stop | restart }"
+ exit 1
+ ;;
+esac
+exit 0
Added: csw/mgar/pkg/munin/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/munin/trunk/files/cswusergroup (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/cswusergroup 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1 @@
+munin:munin:Munin user:/etc/opt/csw/munin:/bin/false:m:r
Added: csw/mgar/pkg/munin/trunk/files/makefile.config.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.config.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,110 @@
+diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile.config munin-1.3.4/Makefile.config
+--- munin-1.3.4.orig/Makefile.config 2008-03-08 07:35:13.000000000 +0100
++++ munin-1.3.4/Makefile.config 2009-07-05 11:01:24.956040045 +0200
+@@ -6,13 +6,15 @@
+ # DESTDIR is empty during building, and optionally set to point to
+ # a shadow tree during make install.
+
++DESTDIR=$(DESTDIR)
++
+ #
+ # the base of the Munin installation.
+ #
+-PREFIX = $(DESTDIR)/opt/munin
++PREFIX = /opt/csw
+
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR = $(DESTDIR)/etc/opt/munin
++CONFDIR = /etc/opt/csw/munin
+
+ # Server only - where to put munin-cron
+ BINDIR = $(PREFIX)/bin
+@@ -21,37 +23,37 @@
+ SBINDIR = $(PREFIX)/sbin
+
+ # Where to put text and html documentation
+-DOCDIR = $(PREFIX)/doc
++DOCDIR = $(PREFIX)/share/doc/munin
+
+ # Where to put man pages
+-MANDIR = $(PREFIX)/man
++MANDIR = $(PREFIX)/share/man
+
+ # Where to put internal binaries and plugin repository
+-LIBDIR = $(PREFIX)/lib
++LIBDIR = $(PREFIX)/lib/munin
+
+ # Server only - Output directory
+-HTMLDIR = $(PREFIX)/var/www
++HTMLDIR = /var/opt/csw/munin/www
+ CGIDIR = $(HTMLDIR)/cgi
+
+ # Client only - Where to put RRD files and other intenal data
+-DBDIR = $(DESTDIR)/var/opt/munin
++DBDIR = /var/opt/csw/munin/db
+
+ # Client only - Where plugins should put their states. Must be writable by
+ # group "munin", and should be preserved between reboots
+ PLUGSTATE = $(DBDIR)/plugin-state
+
+ # Where Munin should place its logs.
+-LOGDIR = $(DESTDIR)/var/log/munin
++LOGDIR = /var/opt/csw/munin/log
+
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+-STATEDIR = $(DESTDIR)/var/run/munin
++STATEDIR = /var/opt/csw/munin/run
+
+ # The perl interpreter to use
+-PERL = $(shell which perl)
++PERL = /opt/csw/bin/perl
+
+ # The python interpreter to use (used by some plugins)
+-PYTHON = /usr/bin/env python
++PYTHON = /opt/csw/bin/python
+
+ # A modern (posix) shell. We're not looking for arrays, but $() and
+ # other modern stuff is expected. On a posix-system the expression
+@@ -64,10 +66,10 @@
+ GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
+
+ # Path of bash for bash specific plugins
+-BASH = /bin/bash
++BASH = /usr/bin/bash
+
+ # Server only - Where to install the perl libraries
+-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+
+ # Client only - Install plugins for this architecture
+ OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]')
+@@ -79,7 +81,7 @@
+ # What is the safest way to create a tempfile.
+ # Default is to figure it out by testing various methods.
+ # Replace this with a known platform-specific method
+-MKTEMP = $(shell ./test-mktemp)
++MKTEMP = $(shell mktemp)
+
+ # Munin version number.
+ VERSION = $(shell cat RELEASE)
+@@ -94,9 +96,9 @@
+ # Which command to use to check if the USER and GROUP to run Munin as, exists.
+ # These will work on most modern OSes:
+ #
+-GETENT = $(shell which getent || which true 2>/dev/null)
+-CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
+-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
++#GETENT = $(shell which getent || which true 2>/dev/null)
++#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
++#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
+
+ # For OSX, comment out the previous two lines and comment in these
+ #
+@@ -117,5 +119,5 @@
+ CHGRP = chgrp
+
+ # Check whether setruid functionality can be used
+-HASSETR = $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
++HASSETR = $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
+
Added: csw/mgar/pkg/munin/trunk/files/makefile.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,336 @@
+diff --speed-large-files --minimal -Nru munin-1.3.4.orig/Makefile munin-1.3.4/Makefile
+--- munin-1.3.4.orig/Makefile 2008-03-08 07:50:16.000000000 +0100
++++ munin-1.3.4/Makefile 2009-07-01 23:52:36.445587463 +0200
+@@ -28,74 +28,71 @@
+ # This removes the installed config so that the next install-pass installs
+ # a new config. Target suitable for maintainers
+ unconfig:
+- rm -f $(HTMLDIR)/.htaccess
+- rm -f $(CONFDIR)/munin.conf
++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf
+
+ install-main: build
+- $(CHECKUSER)
+- mkdir -p $(CONFDIR)/templates
+- mkdir -p $(LIBDIR)
+- mkdir -p $(BINDIR)
+- mkdir -p $(PERLLIB)
+-
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(HTMLDIR)
+- mkdir -p $(DBDIR)
+- mkdir -p $(CGIDIR)
++ mkdir -p $(DESTDIR)$(CONFDIR)/templates
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ mkdir -p $(DESTDIR)$(BINDIR)
++ mkdir -p $(DESTDIR)$(PERLLIB)
+
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
++ mkdir -p $(DESTDIR)$(LOGDIR)
++ mkdir -p $(DESTDIR)$(STATEDIR)
++ mkdir -p $(DESTDIR)$(HTMLDIR)
++ mkdir -p $(DESTDIR)$(DBDIR)
++ mkdir -p $(DESTDIR)$(CGIDIR)
+
+ for p in build/server/*.tmpl; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
+ done
+- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
+- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
+- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
+- $(INSTALL) -m 0755 server/VeraMono.ttf $(LIBDIR)/
+- $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/
+- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess
+- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
+- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
+- $(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/
+- $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
+- $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
+- $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/
+- $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
+- $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
+- $(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/
++ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
++ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
++ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
++ $(INSTALL) -m 0755 server/VeraMono.ttf $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0644 resources/favicon.ico $(DESTDIR)$(HTMLDIR)/
++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
++ $(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
++ $(INSTALL) -m 0755 build/server/munin-check $(DESTDIR)$(BINDIR)/
++ $(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
++ $(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
++ $(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
+
+ uninstall-main: build
+ for p in build/server/*.tmpl; do \
+- rm -f $(CONFDIR)/templates/"$$p" ; \
++ rm -f $(DESTDIR)$(CONFDIR)/templates/"$$p" ; \
+ done
+- rm -f $(CONFDIR)/templates/logo.png
+- rm -f $(CONFDIR)/templates/style.css
+- rm -f $(CONFDIR)/templates/definitions.html
+- rm -f $(HTMLDIR)/.htaccess
++ rm -f $(DESTDIR)$(CONFDIR)/templates/logo.png
++ rm -f $(DESTDIR)$(CONFDIR)/templates/style.css
++ rm -f $(DESTDIR)$(CONFDIR)/templates/definitions.html
++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
+
+- rm -f $(CONFDIR)/munin.conf
++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf
+
+- rm -f $(BINDIR)/munin-cron
+- rm -f $(BINDIR)/munin-check
++ rm -f $(DESTDIR)$(BINDIR)/munin-cron
++ rm -f $(DESTDIR)$(BINDIR)/munin-check
+
+- rm -f $(LIBDIR)/munin-update
+- rm -f $(LIBDIR)/munin-graph
+- rm -f $(LIBDIR)/munin-html
+- rm -f $(LIBDIR)/munin-limits
++ rm -f $(DESTDIR)$(LIBDIR)/munin-update
++ rm -f $(DESTDIR)$(LIBDIR)/munin-graph
++ rm -f $(DESTDIR)$(LIBDIR)/munin-html
++ rm -f $(DESTDIR)$(LIBDIR)/munin-limits
+ rm -f $(CGIDIR)/munin-cgi-graph
+
+- rm -f $(PERLLIB)/Munin.pm
+- -rmdir $(CONFDIR)/templates
+- -rmdir $(CONFDIR)
+- -rmdir $(LIBDIR)
+- -rmdir $(BINDIR)
++ rm -f $(DESTDIR)$(PERLLIB)/Munin.pm
++ -rmdir $(DESTDIR)$(CONFDIR)/templates
++ -rmdir $(DESTDIR)$(CONFDIR)
++ -rmdir $(DESTDIR)$(LIBDIR)
++ -rmdir $(DESTDIR)$(BINDIR)
+
+- -rmdir $(LOGDIR)
+- -rmdir $(STATEDIR)
+- -rmdir $(HTMLDIR)
+- -rmdir $(DBDIR)
+- -rmdir $(CGIDIR)
++ -rmdir $(DESTDIR)$(LOGDIR)
++ -rmdir $(DESTDIR)$(STATEDIR)
++ -rmdir $(DESTDIR)$(HTMLDIR)
++ -rmdir $(DESTDIR)$(DBDIR)
++ -rmdir $(DESTDIR)$(CGIDIR)
+
+ install-node: build install-node-non-snmp install-node-snmp install-munindoc
+ echo Done.
+@@ -104,44 +101,43 @@
+ echo Undone.
+
+ install-node-snmp: build
+- $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
++ $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
+
+ install-munindoc: build
+- $(INSTALL) -m 0755 build/node/munindoc $(BINDIR)/
++ $(INSTALL) -m 0755 build/node/munindoc $(DESTDIR)$(BINDIR)/
+
+ uninstall-node-snmp: build
+- rm -f $(SBINDIR)/munin-node-configure-snmp
+- -rmdir $(SBINDIR)
++ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure-snmp
++ -rmdir $(DESTDIR)$(SBINDIR)
+
+ install-node-non-snmp: build
+ $(CHECKGROUP)
+- mkdir -p $(CONFDIR)/plugins
+- mkdir -p $(CONFDIR)/plugin-conf.d
+- mkdir -p $(LIBDIR)/plugins
+- mkdir -p $(SBINDIR)
+- mkdir -p $(PERLLIB)/Munin/Plugin
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++ mkdir -p $(DESTDIR)$(SBINDIR)
++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
+
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(PLUGSTATE)
++ mkdir -p $(DESTDIR)$(LOGDIR)
++ mkdir -p $(DESTDIR)$(STATEDIR)
++ mkdir -p $(DESTDIR)$(PLUGSTATE)
+
+- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
+- $(CHMOD) 0775 $(PLUGSTATE)
+- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
++ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
++ $(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
+
+- $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
+- $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
+- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+- $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
++ $(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
++ $(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
++ $(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
+
+ uninstall-node-non-snmp: build
+- rm -f $(SBINDIR)/munin-node
+- rm -f $(SBINDIR)/munin-node-configure
+- rm -f $(CONFDIR)/munin-node.conf
+- rm -f $(SBINDIR)/munin-run
+- -rmdir $(CONFDIR)/plugin-conf.d
+- -rmdir $(CONFDIR)
+- -rmdir $(SBINDIR)
++ rm -f $(DESTDIR)$(SBINDIR)/munin-node
++ rm -f $(DESTDIR)$(SBINDIR)/munin-node-configure
++ rm -f $(DESTDIR)$(CONFDIR)/munin-node.conf
++ rm -f $(DESTDIR)$(SBINDIR)/munin-run
++ -rmdir $(DESTDIR)$(CONFDIR)/plugin-conf.d
++ -rmdir $(DESTDIR)$(CONFDIR)
++ -rmdir $(DESTDIR)$(SBINDIR)
+
+
+ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
+@@ -156,67 +152,67 @@
+ if echo $(INSTALL_PLUGINS) | \
+ grep $$family >/dev/null; then \
+ echo Installing $$p; \
+- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \
+ fi; \
+ fi \
+ done
+- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
+- -mkdir -p $(PLUGSTATE)
+- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
+- $(CHMOD) 0775 $(PLUGSTATE)
+- $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
+- $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/
+- mkdir -p $(PERLLIB)/Munin
+- $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/
++ #-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(LIBDIR)
++ -mkdir -p $(DESTDIR)$(PLUGSTATE)
++ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(DESTDIR)$(PLUGSTATE)
++ $(CHMOD) 0775 $(DESTDIR)$(PLUGSTATE)
++ $(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
++ $(INSTALL) -m 0644 build/node/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin
++ $(INSTALL) -m 0644 build/node/Plugin.pm $(DESTDIR)$(PERLLIB)/Munin/
+
+ uninstall-node-plugins: build $(PLUGINS)
+ for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do \
+- rm -f $(LIBDIR)/plugins/`basename $$p` \
++ rm -f $(DESTDIR)$(LIBDIR)/plugins/`basename $$p` \
+ done
+- rm -f $(LIBDIR)/plugins/plugins.history
+- rm -f $(LIBDIR)/plugins/plugin.sh
+- -rm -f $(LIBDIR)/*.adv
++ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugins.history
++ rm -f $(DESTDIR)$(LIBDIR)/plugins/plugin.sh
++ -rm -f $(DESTDIR)$(LIBDIR)/*.adv
+
+ #TODO:
+ # configure plugins. Or not. Better done under the direction of the installer
+ # or the packager.
+
+ install-man: build-man Makefile Makefile.config
+- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
+- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
+- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
+- $(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
+- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
++ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
++ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
++ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
++ $(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
++ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
+
+ uninstall-man: build-man
+- rm -f $(MANDIR)/man5/munin-node.conf.5
+- rm -f $(MANDIR)/man5/munin.conf.5
+- rm -f $(MANDIR)/man8/munin-node.8
+- rm -f $(MANDIR)/man8/munin-node-configure.8
+- rm -f $(MANDIR)/man8/munin-node-configure-snmp.8
+- rm -f $(MANDIR)/man8/munin-run.8
+- rm -f $(MANDIR)/man8/munin-graph.8
+- rm -f $(MANDIR)/man8/munin-update.8
+- rm -f $(MANDIR)/man8/munin-limits.8
+- rm -f $(MANDIR)/man8/munin-html.8
+- rm -f $(MANDIR)/man8/munin-cron.8
+- -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)
++ rm -f $(DESTDIR)$(MANDIR)/man5/munin-node.conf.5
++ rm -f $(DESTDIR)$(MANDIR)/man5/munin.conf.5
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-node-configure-snmp.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-run.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-graph.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-update.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-limits.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-html.8
++ rm -f $(DESTDIR)$(MANDIR)/man8/munin-cron.8
++ -rmdir $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)
+
+ install-doc: build-doc
+- mkdir -p $(DOCDIR)/resources
+- $(INSTALL) -m 0644 README $(DOCDIR)/
+- $(INSTALL) -m 0644 COPYING $(DOCDIR)/
+- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
++ mkdir -p $(DESTDIR)$(DOCDIR)/resources
++ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
++ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
++ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
+
+ uninstall-doc: build-doc
+- rm -rf $(DOCDIR)
++ rm -rf $(DESTDIR)$(DOCDIR)
+
+ build: build-stamp
+
+@@ -363,20 +359,20 @@
+ $(MAKE) $@ CONFIG=t/Makefile.config
+ else
+ test_plugins = id_default id_root env
+-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
++test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
+ @for test in t/*.t; do \
+ echo -n "$$test: "; \
+- PERL5LIB=$(PERLLIB) $(PERL) $$test;\
++ PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\
+ done
+ endif
+
+ node-monkeywrench: install-node
+- rm -rf $(CONFDIR)/plugins
+- rm -rf $(LIBDIR)/plugins
+- mkdir -p $(LIBDIR)/plugins
+- mkdir -p $(CONFDIR)/plugins
+- cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
+- $(SBINDIR)/munin-node-configure --suggest
++ rm -rf $(DESTDIR)$(CONFDIR)/plugins
++ rm -rf $(DESTDIR)$(LIBDIR)/plugins
++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++ cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
++ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest
+ echo 'Done?'
+
+ t/install:
Added: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/munin-node.conf.in munin-1.3.4/node/munin-node.conf.in
+--- munin-1.3.4.orig/node/munin-node.conf.in 2008-03-08 02:42:39.000000000 +0100
++++ munin-1.3.4/node/munin-node.conf.in 2009-07-05 08:45:56.286530895 +0200
+@@ -25,7 +25,7 @@
+ # Set this if the client doesn't report the correct hostname when
+ # telnetting to localhost, port 4949
+ #
+-#host_name @@HOSTNAME@@
++#host_name yourhostname
+
+ # A list of addresses that are allowed to connect. This must be a
+ # regular expression, due to brain damage in Net::Server, which
Added: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin.conf.in munin-1.3.4/server/munin.conf.in
+--- munin-1.3.4.orig/server/munin.conf.in 2008-03-08 02:42:40.000000000 +0100
++++ munin-1.3.4/server/munin.conf.in 2009-07-06 00:16:45.205126727 +0200
+@@ -31,7 +31,7 @@
+ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
+
+ # a simple host tree
+-[@@HOSTNAME@@]
++[HOSTNAME]
+ address 127.0.0.1
+ use_node_name yes
+
Added: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2009-07-06 11:00:33 UTC (rev 5511)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru munin-1.3.4.orig/node/node.d.sunos/memory.in munin-1.3.4/node/node.d.sunos/memory.in
+--- munin-1.3.4.orig/node/node.d.sunos/memory.in 2008-03-08 02:42:39.000000000 +0100
++++ munin-1.3.4/node/node.d.sunos/memory.in 2009-07-03 11:50:10.815859151 +0200
+@@ -11,7 +11,7 @@
+ # FIXME1: Reporting size in MB is Wrong. Report bytes and let rrd scale units
+ # FIXME2: Using kstat would be much better!
+
+-TOP=${top:-/usr/local/bin/top}
++TOP=${top:-/opt/csw/bin/top}
+
+ if [ "$1" = "autoconf" ]; then
+ if [ -x $TOP ] ; then
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