From 039d1805264ab91686416b5cb552390f3f3be819 Mon Sep 17 00:00:00 2001
From: Perry Mason <crazypark2@yahoo.dk>
Date: Thu, 9 Dec 2010 14:32:20 +0100
Subject: [vnstat2] Correct iface title and no need for vnstat.conf

---
 config/vnstat2/bin/vnstat.conf | 25 -------------------------
 config/vnstat2/vnstat2.inc     |  5 +++--
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 config/vnstat2/bin/vnstat.conf

diff --git a/config/vnstat2/bin/vnstat.conf b/config/vnstat2/bin/vnstat.conf
deleted file mode 100644
index ace5094d..00000000
--- a/config/vnstat2/bin/vnstat.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# vnStat 1.10 config file
-##
-
-# location of the database directory
-DatabaseDir "/usr/local/pkg/vnstat"
-
-# on which day should months change
-MonthRotate 1
-
-# vnstati
-##
-
-# image colors
-CBackground     "F0F0F0"
-CEdge           "AEAEAE"
-CHeader         "990000"
-CHeaderTitle    "F0F0F0"
-CHeaderDate     "FFFFFF"
-CText           "000000"
-CLine           "B0B0B0"
-CLineL          "-"
-CRx             "666666"
-CTx             "990000"
-CRxD            "-"
-CTxD            "-"
diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index ff8307c9..dc3b67f5 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -38,8 +38,8 @@ function change_vnstat_conf(){
 }
 
 function write_conf_f(){
-global $config;
-$monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];
+	global $config;
+	$monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];
 
 // ************ Write new vnstat.conf *****************
 
@@ -127,6 +127,7 @@ shared_vnstat();
 }
 
 function shared_vnstat() {
+	global $config;
 // get system nic's and create a database for them
         $array_of_real_nic_names = array();
         $array_of_custom_nic_names = array();
-- 
cgit v1.2.3