[csw-devel] SF.net SVN: gar:[6023] csw/mgar/pkg/munin/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Thu Aug 13 22:09:48 CEST 2009
Revision: 6023
http://gar.svn.sourceforge.net/gar/?rev=6023&view=rev
Author: j_arndt
Date: 2009-08-13 20:09:48 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
munin: changed file location, minor fixes
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
csw/mgar/pkg/munin/trunk/checksums
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2009-08-13 13:40:51 UTC (rev 6022)
+++ csw/mgar/pkg/munin/trunk/Makefile 2009-08-13 20:09:48 UTC (rev 6023)
@@ -89,4 +89,7 @@
@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
+ @rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums 2009-08-13 13:40:51 UTC (rev 6022)
+++ csw/mgar/pkg/munin/trunk/checksums 2009-08-13 20:09:48 UTC (rev 6023)
@@ -1,5 +1,5 @@
-929bda5dc234904152566ab8865082db download/CSWmuninmaster.postinstall
-f542a35d07f20348daa1460d32911d0a download/CSWmuninmaster.prototype
+b494ca780b9becd6a8611e255e606dd4 download/CSWmuninmaster.postinstall
+29939c1794e6c602d54effac74e5c89d download/CSWmuninmaster.prototype
6cb29ccba599b5ddcea7581197bf986d download/CSWmuninnode.prototype
e6bafa4aa3cba7fc16e444ad168b4cd1 download/README.CSW
59409f4b412953283c3df4546fd4886c download/apache-munin-cgi.conf.CSW
@@ -7,7 +7,7 @@
50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup
4eb0923e09f12335da8249ab7923e250 download/makefile.config.diff
3ea1ba00633ac52c3a25306c3c9c52e0 download/makefile.diff
-f44022c818a112b1121d10e1112e107e download/munin-graph.in.diff
+064e12aa12bc7d4cb312b576ae658d1e download/munin-graph.in.diff
ce97aa8e741383039fb365d1a322f3e7 download/munin-node.conf.in.diff
4688659429fbebf8cafcc8eb8a1ee870 download/munin-update.in.diff
737e3e3d2f68015dfb4e857909cde7da download/munin.conf.in.diff
Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-08-13 13:40:51 UTC (rev 6022)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.postinstall 2009-08-13 20:09:48 UTC (rev 6023)
@@ -14,19 +14,23 @@
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
(2) Edit the Apache configuration for Munin:
- "Normal" mode: /etc/opt/csw/munin/apache/apache.conf
+ "Normal" mode: /etc/opt/csw/munin/apache/apache-munin.conf
CGI mode: /etc/opt/csw/munin/apache/apache-munin-cgi.conf
(These files should work by default)
-(3) Add the following line to your Apache configuration
+(3) Add the following line to your Apache configuration:
- "Normal" mode: Include /etc/opt/csw/munin/apache/apache.conf
+ "Normal" mode: Include /etc/opt/csw/munin/apache/apache-munin.conf
CGI mode: Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf
(4) Add the user your webserver is running under (nobody for Apache) to
the group "munin"
+(5) Restart your webserver:
+
+ svcadm restart cswapache2
+
#
#
#
Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-08-13 13:40:51 UTC (rev 6022)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype 2009-08-13 20:09:48 UTC (rev 6023)
@@ -3,7 +3,7 @@
f cswpreserveconf /etc/opt/csw/munin/munin.conf.CSW 0644 root bin
f none /opt/csw/bin/munin-check 0755 root bin
f none /opt/csw/bin/munin-cron 0755 root bin
-f none /opt/csw/libexec/munin/VeraMono.ttf 0755 root bin
+f none /opt/csw/share/munin/fonts/VeraMono.ttf 0644 root bin
f none /opt/csw/libexec/munin/munin-graph 0755 root bin
f none /opt/csw/libexec/munin/munin-html 0755 root bin
f none /opt/csw/libexec/munin/munin-limits 0755 root bin
Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-08-13 13:40:51 UTC (rev 6022)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2009-08-13 20:09:48 UTC (rev 6023)
@@ -1,12 +1,16 @@
diff --speed-large-files --minimal -Nru munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in
--- munin-1.3.4.orig/server/munin-graph.in 2008-03-08 02:42:40.000000000 +0100
-+++ munin-1.3.4/server/munin-graph.in 2009-07-07 10:51:42.606467982 +0200
-@@ -827,7 +827,7 @@
++++ munin-1.3.4/server/munin-graph.in 2009-08-13 20:59:35.901535076 +0200
+@@ -827,9 +827,9 @@
my @complete = ();
if ($RRDkludge) {
push (@complete,
- '--font' ,'LEGEND:7:@@LIBDIR@@/VeraMono.ttf',
+- '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf',
+- '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf');
+ '--font' ,'LEGEND:7:@@LIBDIR@@/monospace',
- '--font' ,'UNIT:7:@@LIBDIR@@/VeraMono.ttf',
- '--font' ,'AXIS:7:@@LIBDIR@@/VeraMono.ttf');
++ '--font' ,'UNIT:7:/opt/csw/share/munin/fonts/VeraMono.ttf',
++ '--font' ,'AXIS:7:/opt/csw/share/munin/fonts/VeraMono.ttf');
}
+ push(@complete,'-W', $watermark) if $RRDs::VERSION >= 1.2;
+
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