summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-01-14 23:35:35 -0600
committerChris Buechler <cmb@pfsense.org>2016-01-14 23:35:35 -0600
commit1ac4e6ae07da547bb0aa7845f7e5c245e59b7763 (patch)
tree3c86115cb5f968735245cbae9206cf4499647f51 /src
parentdfc4a759eb687efb7698f8e8f9e83300eb4bc13a (diff)
downloadpfsense-1ac4e6ae07da547bb0aa7845f7e5c245e59b7763.zip
pfsense-1ac4e6ae07da547bb0aa7845f7e5c245e59b7763.tar.gz
Add config upgrade code to remove L7 config pieces, and file a notice where found. Ticket #5508
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/globals.inc2
-rw-r--r--src/etc/inc/upgrade_config.inc16
2 files changed, 17 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index 1098342..d0e0fd5 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -99,7 +99,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
- "latest_config" => "13.5",
+ "latest_config" => "13.6",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 6217210..aa3ec70 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4269,4 +4269,20 @@ function upgrade_134_to_135() {
$config['syslog']['nolognginx'] = true;
}
}
+
+function upgrade_135_to_136() {
+ global $config;
+
+ if (isset($config['l7shaper'])) {
+ file_notice("L7shaper", "Layer 7 shaping is no longer supported. Its configuration has been removed.");
+ unset($config['l7shaper']);
+ if (is_array($config['filter']['rule'])) {
+ foreach ($config['filter']['rule'] as $idx => $rule) {
+ if (isset($rule['l7container'])) {
+ unset($config['filter']['rule'][$idx]['l7container']);
+ }
+ }
+ }
+ }
+}
?>
OpenPOWER on IntegriCloud