diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-07-21 21:47:37 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-07-21 21:47:37 +0000 |
| commit | 694870530ce003cc7ed5dd102cf7c0e2f4681dd2 (patch) | |
| tree | bfbde1b1474a251245fd8b880486c8bae12317fb /etc | |
| parent | e1cb5d69a9ed7bde5f673708b210f95acc05ea0c (diff) | |
| download | pfsense-694870530ce003cc7ed5dd102cf7c0e2f4681dd2.zip pfsense-694870530ce003cc7ed5dd102cf7c0e2f4681dd2.tar.gz | |
Add rrd graph settings page.
Bump config out of line with 1.2
Add rrd config upgrade code.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 19 | ||||
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 |
2 files changed, 14 insertions, 9 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']}"); } diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 186edef..a4419ce 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -8,7 +8,7 @@ * $Id$ ****** * - * Copyright (C) 2004-2006 Scott Ullrich (sullrich@gmail.com) + * Copyright (C) 2004-2007 Scott Ullrich (sullrich@gmail.com) * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -2914,8 +2914,6 @@ function enable_rrd_graphing() { $rrdrestore = ""; $rrdreturn = ""; - $config['rrd']['enable'] = true; - if (isset ($config['rrd']['enable'])) { /* create directory if needed */ |
