Add rrd graph settings page.

Bump config out of line with 1.2
Add rrd config upgrade code.

1 files changed, 13 insertions, 6 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 927dc5f..18a4a1c 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -997,8 +997,8 @@ function convert_config() {
 		$config['version'] = "2.9";
 	}
 
-	/* Convert 2.9 -> 3.0 */
-	if ($config['version'] <= 2.9) {
+	/* Convert 2.9 -> 4.0 */
+	if ($config['version'] <= 3.9) {
 		$config['system']['webgui']['auth_method'] = "session";
 		$config['system']['webgui']['backing_method'] = "htpasswd";
 
@@ -1043,13 +1043,13 @@ function convert_config() {
 			unset ($config['system']['username']);
 			unset ($config['system']['password']);
 			
-			$config['version'] = "3.0";
+			$config['version'] = "4.0";
 		}
 
 	}
 		
-	/* Convert 3.0 -> 3.1 */
-	if ($config['version'] <= 3.0) {
+	/* Convert 4.0 -> 4.1 */
+	if ($config['version'] <= 4.0) {
 		if(!$config['sysctl']) {
 
 			$config['sysctl']['item'] = array();
@@ -1122,11 +1122,18 @@ function convert_config() {
 			$config['sysctl']['item'][16]['desc'] =    "The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput. ";
 			$config['sysctl']['item'][16]['value'] =   "3";
 
-			$config['version'] = "3.1";
+			$config['version'] = "4.1";
 		}
 
 	}
 
+	/* Convert 4.1 -> 4.2 */
+	if ($config['version'] <= 4.1) {
+		/* enable the rrd config setting by default */
+		$config['rrd']['enable'] = true;
+		$config['version'] = "4.2";
+	}
+
 	if ($prev_version != $config['version'])
 		write_config("Upgraded config version level from {$prev_version} to {$config['version']}");
 }