cc3453e362699d511f57e914a97ff723d73d5208
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 10_pathnames.dpatch by Wolfgang Barth <wob@swobspace.net>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: No description.
7 @DPATCH@
8 diff -urNad trunk~/etc/nagvis.ini.php-sample trunk/etc/nagvis.ini.php-sample
9 --- trunk~/etc/nagvis.ini.php-sample 2009-11-27 16:41:36.000000000 +0100
10 +++ trunk/etc/nagvis.ini.php-sample 2009-11-28 17:20:58.000000000 +0100
11 @@ -24,17 +24,20 @@
13 ; Path definitions
14 [paths]
15 -; absolute physical NagVis path
16 -;base="/usr/local/nagios/share/nagvis/"
17 +base="/usr/share/nagvis/htdocs/"
18 +cfg="/etc/nagvis/"
19 +var="/var/cache/nagvis/"
20 +map="/var/lib/nagvis/images/maps/"
21 +mapcfg="/etc/nagvis/maps/"
22 ; absolute html NagVis path
23 -;htmlbase="/nagios/nagvis"
24 +htmlbase="/nagvis"
25 ; absolute html NagVis cgi path
26 -;htmlcgi="/nagios/cgi-bin"
27 +htmlcgi="/nagios3/cgi-bin"
29 ; Default values which get inherited to the maps and its objects
30 [defaults]
31 ; default backend (id of the default backend)
32 -;backend="ndomy_1"
33 +backend="ndomy_1"
34 ; background color of maps
35 ;backgroundcolor="#fff"
36 ; Enable/Disable the context menu on map objects. With the context menu you are
37 @@ -123,7 +126,7 @@
38 ; Default root host (NagVis uses this if it can't detect it via NDO)
39 ;defaultroot=""
40 ; Path to the graphviz binaries (dot,neato,...); Only needed if not in ENV PATH
41 -;graphvizpath="/usr/bin/"
42 +graphvizpath="/usr/bin"
43 ; Show the automap in the lists (Map index and dropdown menu in header)
44 ;showinlists=1
46 @@ -158,8 +161,8 @@
47 ; ----------------------------
49 ; Example definition of a livestatus backend. In this case the backend_id is live_1
50 -[backend_live_1]
51 -backendtype="mklivestatus"
52 +;[backend_live_1]
53 +;backendtype="mklivestatus"
54 ;socket="unix:/usr/local/nagios/var/rw/live"
56 ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
57 @@ -186,9 +189,9 @@
58 ;htmlcgi="/nagios/cgi-bin"
60 ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
61 -[backend_ndo2fs_1]
62 +;[backend_ndo2fs_1]
63 ; type of backend - MUST be set
64 -backendtype="ndo2fs"
65 +;backendtype="ndo2fs"
66 ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
67 ;path="/usr/local/ndo2fs/var"
68 ; Name of the instance to get the data from
69 @@ -198,37 +201,18 @@
70 ; path to the cgi-bin of this backend
71 ;htmlcgi="/nagios/cgi-bin"
73 -; in this example the ID of the Backend is "merlinmy_1" you can define another ID.
74 -[backend_merlinmy_1]
75 -; type of backend - MUST be set
76 -backendtype="merlinmy"
77 -; hostname for Merlin db
78 -;dbhost="localhost"
79 -; portname for Merlin db
80 -;dbport=3306
81 -; database name for Merlin db
82 -;dbname="merlin"
83 -; username for Merlin db
84 -;dbuser="merlin"
85 -; password for Merlin db
86 -;dbpass="merlin"
87 -; maximum delay of the Merlin Database in seconds
88 -;maxtimewithoutupdate=180
89 -; path to the cgi-bin of this backend
90 -;htmlcgi="/nagios/cgi-bin"
91 -
92 ; ----------------------------
93 ; Rotation pool definitions
94 ; ----------------------------
96 ; in this example the browser switches between the maps demo and demo2 every 15
97 ; seconds, the rotation is enabled by url: index.php?rotation=demo
98 -[rotation_demo]
99 +;[rotation_demo]
100 ; These steps are rotated. The "Demo2:" is a label which is being displayed in
101 ; the index pages rotation list.
102 -maps="demo,Demo2:demo2"
103 +;maps="demo,Demo2:demo2"
104 ; rotation interval (seconds)
105 -interval=15
106 +;interval=15
108 ; ------------------------------------------------------------------------------
109 ; Below you find some advanced stuff