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

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Sun Apr 3 15:04:12 CEST 2011


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

Log Message:
-----------
munin: makefile cleanup, packages now use cswcptemplate for config files

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

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2011-04-02 22:00:20 UTC (rev 14060)
+++ csw/mgar/pkg/munin/trunk/Makefile	2011-04-03 13:04:12 UTC (rev 14061)
@@ -53,12 +53,12 @@
 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils
 
 RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon
-RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWmuninnode += CSWcswclassutils CSWcas-cptemplates
 
 RUNTIME_DEP_PKGS_CSWmuninnode += CSWperl CSWpmnetssleay
 
-SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswpreserveconf ugfiles
-SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswpreserveconf cswinitsmf
+SPKG_CLASSES_CSWmuninmaster = none cswusergroup cswcptemplates ugfiles
+SPKG_CLASSES_CSWmuninnode = none cswusergroup ugfiles cswcptemplates cswinitsmf
 SPKG_CLASSES_CSWmunincommon = none
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -79,26 +79,42 @@
 	@$(MAKECOOKIE)
 
 install-custom:
+	@#
+	@# because the configure / installation process of munin is somewhat unusual
+	@# we have to do it manually
+	@#
 	@cat $(WORKSRC)/Makefile | sed -e "s;DESTDIR =;& $(DESTDIR);g" > $(WORKSRC)/Makefile.tmp
 	@( cd $(WORKSRC); gmake -f Makefile ; cp Makefile.tmp Makefile ; gmake -f Makefile install)
-	@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
-	@mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/var/opt/csw/munin/www/.htaccess.CSW
-	#@ginstall -d $(DESTDIR)/opt/csw/munin
-	@ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache
-	@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW
-	@ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW
+	@#
+	@# we are using cswclassutils -> cswcptemplate
+	@#
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache
+	@ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www
+	@mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/
+	@mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/
+	@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin.conf
+	@ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf
+	@mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/
+	@#
+	@# create user munin during package deployment -> cswusergroup
+	@#
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninmaster/cswusergroup
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmuninnode/cswusergroup
+	@#
+	@# 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
+	@#
+	@# 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
-	@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 -d $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode
 	@ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts
-	#@ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
 	@ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf
-	#@rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2011-04-02 22:00:20 UTC (rev 14060)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2011-04-03 13:04:12 UTC (rev 14061)
@@ -1,9 +1,12 @@
 d none /etc/opt/csw/munin 0755 root bin
 d none /etc/opt/csw/munin/apache 0755 root bin
-f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin-cgi.conf.CSW 0644 root bin
-f cswpreserveconf /etc/opt/csw/munin/apache/apache-munin.conf.CSW 0644 root bin
+d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin 0755 root bin
+d none /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache 0755 root bin
+d none /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www 0755 root bin
+f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin-cgi.conf 0644 root bin
+f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/apache/apache-munin.conf 0644 root bin
 d none /etc/opt/csw/munin/munin-conf.d 0755 root bin
-f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin
+f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/etc/opt/csw/munin/munin.conf 0644 root bin
 d none /etc/opt/csw/munin/plugin-conf.d 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
@@ -96,4 +99,4 @@
 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/www 0755 munin munin
-f cswpreserveconf /var/opt/csw/munin/www/.htaccess.CSW 0644 munin munin
+f cswcptemplates /opt/csw/etc/templates/CSWmuninmaster/var/opt/csw/munin/www/.htaccess 0644 munin munin

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype	2011-04-02 22:00:20 UTC (rev 14060)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninnode.prototype	2011-04-03 13:04:12 UTC (rev 14061)
@@ -1,7 +1,8 @@
 d none /etc/opt/csw/init.d 0755 root bin
 f cswinitsmf /etc/opt/csw/init.d/cswmuninnode 0755 root bin
 d none /etc/opt/csw/munin 0755 root bin
-f cswpreserveconf /etc/opt/csw/munin/munin-node.conf.CSW 0644 root bin
+d none /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin 0755 root bin
+f cswcptemplates /opt/csw/etc/templates/CSWmuninnode/etc/opt/csw/munin/munin-node.conf 0644 root bin
 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 0555 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