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

[j_arndt at users.sourceforge.net]

Revision: 10507
          http://gar.svn.sourceforge.net/gar/?rev=10507&view=rev
Author:   j_arndt
Date:     2010-07-12 19:25:00 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
munin: fixed paths in munin-htaccess.in

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 15:49:38 UTC (rev 10506)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 19:25:00 UTC (rev 10507)
@@ -26,6 +26,7 @@
 PATCHFILES += sunos_memory.in.patch
 PATCHFILES += munin-node.conf.in.patch
 PATCHFILES += munin.conf.in.patch
+PATCHFILES += munin-htaccess.in.patch
 PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin 
 PATCHFILES += perl.patch # shebang correctly set
 

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-12 15:49:38 UTC (rev 10506)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-12 19:25:00 UTC (rev 10507)
@@ -11,6 +11,7 @@
 50fa4a545f878d79e219891c6ac8d2d2  cswusergroup
 4ae84b9a27b686c3819d8d7b51d8cb4c  munin-1.4.5.tar.gz
 1a13b606a5c82958ed8e9bf139044988  munin-graph.in.patch
+e96eab2e321a33517d88dfbe1d510211  munin-htaccess.in.patch
 803021ab0539f83936c9adec6bd9336c  munin-node.conf.in.patch
 e9d94e230c8719c5d7d3fe624e87bea2  munin.conf.in.patch
 c0e9f043fe5ea79a1fc7dfc91f09a961  perl.patch

Added: csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch	2010-07-12 19:25:00 UTC (rev 10507)
@@ -0,0 +1,34 @@
+From 52ea662193a0922aef3c4f82fe2b672e70e5ee13 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Mon, 12 Jul 2010 20:55:23 +0200
+Subject: [PATCH] munin-htaccess.in: set paths for OpenCSW
+
+---
+ master/www/munin-htaccess.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in
+index f6c6321..c5f355d 100644
+--- a/master/www/munin-htaccess.in
++++ b/master/www/munin-htaccess.in
+@@ -2,14 +2,14 @@
+ # config file.
+ #
+ # For the .htaccess file option to work the munin www directory
+-# (@@HTMLDIR@@) must have "AllowOverride all" or something close
++# (/var/opt/csw/munin/www) must have "AllowOverride all" or something close
+ # to that set.
+ #
+ # As a config file enclose it in <directory> like so:
+ # 
+-# <directory @@HTMLDIR@@>
++# <directory /var/opt/csw/munin/www>
+ 
+-AuthUserFile @@CONFDIR@@/munin-htpasswd
++AuthUserFile /etc/opt/csw/munin/munin-htpasswd
+ AuthName "Munin"
+ AuthType Basic
+ require valid-user
+-- 
+1.7.1
+


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