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

[j_arndt at users.sourceforge.net]

Revision: 14062
          http://gar.svn.sourceforge.net/gar/?rev=14062&view=rev
Author:   j_arndt
Date:     2011-04-03 15:37:36 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
munin: packages now use cswcrontab action script

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
    csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
    csw/mgar/pkg/munin/trunk/files/cswusergroup

Added Paths:
-----------
    csw/mgar/pkg/munin/trunk/files/crontab.munin

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2011-04-03 13:04:12 UTC (rev 14061)
+++ csw/mgar/pkg/munin/trunk/Makefile	2011-04-03 15:37:36 UTC (rev 14062)
@@ -50,14 +50,14 @@
 
 RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon
 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWpm-rrdtool CSWapache2 
-RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils CSWcas-cptemplates CSWcas-crontab
 
 RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon
 RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils CSWcas-cptemplates
 
 RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay
 
-SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcptemplates ugfiles
+SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcrontab cswcptemplates ugfiles
 SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf
 SPKG_CLASSES_CSWmunincommon = none
 
@@ -100,6 +100,8 @@
 	@#
 	@# create user munin during package deployment -> cswusergroup
 	@#
+	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster
+	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode
 	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup
 	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup
 	@#
@@ -108,10 +110,13 @@
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(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 -m 644 $(FILEDIR)/crontab.munin $(DESTDIR)/etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin
+	@#
 	@# handle some other files
 	@#
-	@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)/README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/README.CSW

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall	2011-04-03 13:04:12 UTC (rev 14061)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall	2011-04-03 15:37:36 UTC (rev 14062)
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-passwd -N munin
-
 cat << EOF
 
 =======================================================================

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2011-04-03 13:04:12 UTC (rev 14061)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2011-04-03 15:37:36 UTC (rev 14062)
@@ -100,3 +100,5 @@
 d ugfiles /var/opt/csw/munin/run 0755 munin munin
 d ugfiles /var/opt/csw/munin/www 0755 munin munin
 f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/.htaccess 0644 munin munin
+d none /etc/opt/csw/pkg/CSWmuninmaster/crontabs 0755 root bin
+f cswcrontab /etc/opt/csw/pkg/CSWmuninmaster/crontabs/munin 0644 root bin

Added: csw/mgar/pkg/munin/trunk/files/crontab.munin
===================================================================
--- csw/mgar/pkg/munin/trunk/files/crontab.munin	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/crontab.munin	2011-04-03 15:37:36 UTC (rev 14062)
@@ -0,0 +1 @@
+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

Modified: csw/mgar/pkg/munin/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/munin/trunk/files/cswusergroup	2011-04-03 13:04:12 UTC (rev 14061)
+++ csw/mgar/pkg/munin/trunk/files/cswusergroup	2011-04-03 15:37:36 UTC (rev 14062)
@@ -1 +1 @@
-munin:munin:Munin user:/etc/opt/csw/munin:/bin/false:m:r
+munin:munin:Munin user:/etc/opt/csw/munin::m:r:NP


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