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

[j_arndt at users.sourceforge.net]

Revision: 10508
          http://gar.svn.sourceforge.net/gar/?rev=10508&view=rev
Author:   j_arndt
Date:     2010-07-12 20:29:26 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
munin: /var/opt/csw/munin/www/.htaccess now handled with cswpreserveconf

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

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 20:29:26 UTC (rev 10508)
@@ -83,6 +83,7 @@
 	#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
+	@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

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-12 20:29:26 UTC (rev 10508)
@@ -1,6 +1,6 @@
 58ab277c1a958459e5270da07f017fb3  CSWmunincommon.prototype
 390277cc59e2c37d5b0bd4f2c3441996  CSWmuninmaster.postinstall
-8bd7bf2d0356a424fe58c7b3058ee3b4  CSWmuninmaster.prototype
+35853c8c9bd199828b58b668e2056025  CSWmuninmaster.prototype
 c4064b92df7835bf37b18e799aa6177e  CSWmuninnode.prototype
 e777f0ddea3e09d0faf72780ad782995  Makefile.config.patch
 1e3c461f2beafce43d6b94f3af478e5e  Makefile.patch

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2010-07-12 20:29:26 UTC (rev 10508)
@@ -96,4 +96,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 ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin
+f cswpreserveconf /var/opt/csw/munin/www/.htaccess.CSW 0644 munin munin


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