diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-09-17 19:06:30 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-09-17 19:06:30 +0000 |
| commit | 5f05bdc48cb5e9e9d3e0c8029c3bd09f73df2a32 (patch) | |
| tree | c62f6ef983940e119a978662b81ae9376e2e4b96 | |
| parent | f7eec0bcb67ba1bd3d49fad04578b1c5446f1931 (diff) | |
| download | pfsense-5f05bdc48cb5e9e9d3e0c8029c3bd09f73df2a32.zip pfsense-5f05bdc48cb5e9e9d3e0c8029c3bd09f73df2a32.tar.gz | |
MFC RELENG_1. Make it possible to disable RRD graphs. Bump config so it's on by default if it wasn't already.
| -rw-r--r-- | etc/inc/config.inc | 9 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 4 | ||||
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index df2b026..54f987e 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -994,6 +994,13 @@ function convert_config() { $config['version'] = "2.9"; } + /* Convert 2.9 -> 3.0 */ + if ($config['version'] <= 2.9) { + /* enable the rrd config setting by default */ + $config['rrd']['enable'] = true; + $config['version'] = "3.0"; + } + if ($prev_version != $config['version']) write_config("Upgraded config version level from {$prev_version} to {$config['version']}"); } @@ -1832,4 +1839,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?>
\ No newline at end of file +?> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 69bf973..1b86807 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -53,7 +53,7 @@ $g = array( "n_pppoe_units" => 16, /* this value can be overriden in pppoe->n_pppoe_units */ "pppoe_subnet" => 28, /* this value can be overriden in pppoe->pppoe_subnet */ "debug" => false, - "latest_config" => "2.9", + "latest_config" => "3.0", "nopkg_platforms" => array("cdrom"), "nopccard_platforms" => array("wrap", "net48xx"), "xmlrpcbaseurl" => "www.pfsense.com", @@ -73,4 +73,4 @@ $iptos = array("lowdelay", "throughput", "reliability"); /* TCP flags */ $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg"); -?>
\ No newline at end of file +?> diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index acbbb9f..3271a4c 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2844,8 +2844,6 @@ function enable_rrd_graphing() { $rrdrestore = ""; $rrdreturn = ""; - $config['rrd']['enable'] = true; - if (isset ($config['rrd']['enable'])) { /* create directory if needed */ |
