|
Lines 1-7
Link Here
|
| 1 |
--- routers2.conf.orig 2008-11-06 11:19:55.000000000 +0100 |
1 |
--- routers2.conf.orig 2013-07-30 06:09:20.000000000 +0200 |
| 2 |
+++ routers2.conf 2008-11-06 11:46:39.000000000 +0100 |
2 |
+++ routers2.conf 2016-02-05 08:48:48.910106000 +0100 |
| 3 |
@@ -148,7 +148,7 @@ |
3 |
@@ -162,7 +162,7 @@ |
| 4 |
#mysql-database = authdb |
4 |
# pass = varchar(50), encrypted password |
| 5 |
# |
5 |
# |
| 6 |
# Multi-language characters support: set charset here. |
6 |
# Multi-language characters support: set charset here. |
| 7 |
-#charset = iso-8859-1 |
7 |
-#charset = iso-8859-1 |
|
Lines 9-15
Link Here
|
| 9 |
#charset = utf-8 |
9 |
#charset = utf-8 |
| 10 |
# |
10 |
# |
| 11 |
# Language support |
11 |
# Language support |
| 12 |
@@ -186,7 +186,7 @@ |
12 |
@@ -214,7 +214,7 @@ |
| 13 |
# Set this to 'yes' to greatly speed up the parsing at the expense of |
13 |
# Set this to 'yes' to greatly speed up the parsing at the expense of |
| 14 |
# having to have your .cfg files in a set format. DO NOT enable this |
14 |
# having to have your .cfg files in a set format. DO NOT enable this |
| 15 |
# unless you are sure that your .cfg files meet the necessary criteria. |
15 |
# unless you are sure that your .cfg files meet the necessary criteria. |
|
Lines 18-24
Link Here
|
| 18 |
# |
18 |
# |
| 19 |
# Set this to no if your browser barfs on the popup javascript. Default is yes. |
19 |
# Set this to no if your browser barfs on the popup javascript. Default is yes. |
| 20 |
#javascript = no |
20 |
#javascript = no |
| 21 |
@@ -208,17 +208,17 @@ |
21 |
@@ -236,17 +236,17 @@ |
| 22 |
# is not really necessary in here and can (usually) be safely ignored. |
22 |
# is not really necessary in here and can (usually) be safely ignored. |
| 23 |
# NT users can put a drive letter in if required. |
23 |
# NT users can put a drive letter in if required. |
| 24 |
# dbpath = D:\rrdtool\files |
24 |
# dbpath = D:\rrdtool\files |
|
Lines 39-45
Link Here
|
| 39 |
# Wildcarded pattern match for MRTG conf files. |
39 |
# Wildcarded pattern match for MRTG conf files. |
| 40 |
# You can put several of these here, separated by spaces. |
40 |
# You can put several of these here, separated by spaces. |
| 41 |
# Note that these can include a path separator - eg, site*/*.cfg |
41 |
# Note that these can include a path separator - eg, site*/*.cfg |
| 42 |
@@ -269,28 +269,29 @@ |
42 |
@@ -297,29 +297,30 @@ |
| 43 |
# |
43 |
# |
| 44 |
# The default graph type. Must be 6 d w m y or dwmy (All graphs). Default is d |
44 |
# The default graph type. Must be 6 d w m y or dwmy (All graphs). Default is d |
| 45 |
#graphtype = d |
45 |
#graphtype = d |
|
Lines 66-80
Link Here
|
| 66 |
# yes/no/always default: no |
66 |
# yes/no/always default: no |
| 67 |
-#6hour = no |
67 |
-#6hour = no |
| 68 |
+6hour = yes |
68 |
+6hour = yes |
|
|
69 |
|
| 69 |
# Shall we have the 95th percentile and total usage calculations? |
70 |
# Shall we have the 95th percentile and total usage calculations? |
| 70 |
# This can eat a LOT of CPU/Memory, so make sure to test with it OFF first. |
71 |
# This can eat a LOT of CPU/Memory, so make sure to test with it OFF first. |
| 71 |
# default: no |
72 |
# default: no |
| 72 |
-#percentile = yes |
73 |
-#percentile = yes |
| 73 |
+percentile = yes |
74 |
+percentile = yes |
| 74 |
# Shall we use the last update time as the base, instead of the current time? |
75 |
# What level should this percentile be? Default is 95th. |
| 75 |
# This can stop the occasional occurence of a grey band at the end of the graph |
76 |
# default: 95 |
| 76 |
# and is useful if demoing the software with some (non-updated) test data. |
77 |
#percent = 90 |
| 77 |
@@ -311,7 +312,7 @@ |
78 |
@@ -345,7 +346,7 @@ |
| 78 |
# All styles: |
79 |
# All styles: |
| 79 |
#sorder = s t n n2 l l2 l2D x x2 x3 x3D sbp nbp sp np |
80 |
#sorder = s t n n2 l l2 l2D x x2 x3 x3D sbp nbp sp np |
| 80 |
# No PDA support: |
81 |
# No PDA support: |
|
Lines 83-95
Link Here
|
| 83 |
# Style codes are usually made from the width code (stnlx), and an optional |
84 |
# Style codes are usually made from the width code (stnlx), and an optional |
| 84 |
# suffix consisting of 2(double heigth), b(black and white), p(PDA mode). |
85 |
# suffix consisting of 2(double heigth), b(black and white), p(PDA mode). |
| 85 |
# Also now we can have a suffix of 3 for triple-height. |
86 |
# Also now we can have a suffix of 3 for triple-height. |
| 86 |
@@ -353,14 +354,14 @@ |
87 |
@@ -387,14 +388,14 @@ |
| 87 |
# Do we want a 'total traffic' line on the default 'incoming' and |
88 |
# Do we want a 'total traffic' line on the default 'incoming' and |
| 88 |
# 'outgoing' graphs? |
89 |
# 'outgoing' graphs? |
| 89 |
# yes/no default is NO |
90 |
# yes/no default is NO |
| 90 |
-#showtotal = no |
91 |
-#showtotal = no |
| 91 |
+showtotal = yes |
92 |
+showtotal = yes |
| 92 |
# |
93 |
|
| 93 |
# Group the router names in the left-hand menu by directory name? |
94 |
# Group the router names in the left-hand menu by directory name? |
| 94 |
# yes/no default is NO |
95 |
# yes/no default is NO |
| 95 |
-#group = yes |
96 |
-#group = yes |
|
Lines 101-107
Link Here
|
| 101 |
# Groups heirachy is by group description, separated by :. Change the separating |
102 |
# Groups heirachy is by group description, separated by :. Change the separating |
| 102 |
# character here: |
103 |
# character here: |
| 103 |
#groupsep = : |
104 |
#groupsep = : |
| 104 |
@@ -385,8 +386,8 @@ |
105 |
@@ -418,8 +419,8 @@ |
| 105 |
# maybe you'd prefer 8 and 18 ? |
106 |
# maybe you'd prefer 8 and 18 ? |
| 106 |
# These hours may NOT cross midnight (ie, end > start) and are relative to the |
107 |
# These hours may NOT cross midnight (ie, end > start) and are relative to the |
| 107 |
# timezone of the target in question, or local timezone if not known. |
108 |
# timezone of the target in question, or local timezone if not known. |
|
Lines 109-130
Link Here
|
| 109 |
-#dayend = 18 |
110 |
-#dayend = 18 |
| 110 |
+daystart = 8 |
111 |
+daystart = 8 |
| 111 |
+dayend = 18 |
112 |
+dayend = 18 |
| 112 |
# Work days - Sun=0 -- default 1 2 3 4 5 |
113 |
|
| 113 |
# THIS NOT YET USED: EXPERIMENTAL |
114 |
# THIS NOT YET USED: EXPERIMENTAL |
| 114 |
#workdays = 1 2 3 4 5 |
115 |
# Work days - Sun=0 -- default 1 2 3 4 5 |
| 115 |
@@ -462,6 +463,7 @@ |
116 |
@@ -496,7 +497,7 @@ |
|
|
117 |
|
| 116 |
# Use twin-menu screen format (not recommended for screens < 1024x768 ) |
118 |
# Use twin-menu screen format (not recommended for screens < 1024x768 ) |
| 117 |
# yes/no default is NO |
119 |
# yes/no default is NO |
| 118 |
#twinmenu = no |
120 |
-#twinmenu = no |
| 119 |
+twinmenu = yes |
121 |
+twinmenu = yes |
| 120 |
# |
122 |
|
| 121 |
# Normally, graphs refresh automatically as soon as they become out of date. |
123 |
# Normally, graphs refresh automatically as soon as they become out of date. |
| 122 |
# This is about every 5 mins for daily graphs. You may wish to make the |
124 |
# This is about every 5 mins for daily graphs. You may wish to make the |
| 123 |
@@ -521,6 +523,7 @@ |
125 |
@@ -560,6 +561,7 @@ |
| 124 |
# Set to 'no' to never use 'lazy' mode. A bug in rrdtool 1.3.0 and 1.3.1 can |
126 |
# Set to 'no' to never use 'lazy' mode. A bug in rrdtool 1.3.0 and 1.3.1 can |
| 125 |
# make lazy mode result in nondisplaying or nonupdating graph images. |
127 |
# make lazy mode result in nondisplaying or nonupdating graph images. |
| 126 |
#lazy = no |
128 |
#lazy = no |
| 127 |
+lazy = yes |
129 |
+lazy = yes |
| 128 |
|
130 |
|
| 129 |
# short descriptions for routers and interfaces |
131 |
# Set to 'yes' to enable Pango markup in graph labels. Experimental. |
| 130 |
# These are used in the lefthand menu, and in small graphs. |
132 |
#pango = no |