diff options
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/unbound.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index ae7352f..67c33ce 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -73,7 +73,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "11.4", + "latest_config" => "11.5", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index 1bd2f7e..496ca66 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -205,7 +205,7 @@ EOF; // Add custom Unbound options if ($config['unbound']['custom_options']) { - $custom_options_source = explode("\n", $config['unbound']['custom_options']); + $custom_options_source = explode("\n", base64_decode($config['unbound']['custom_options'])); $custom_options = "# Unbound custom options\n"; foreach ($custom_options_source as $ent) $custom_options .= $ent."\n"; diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 324e51e..72fc80f 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3532,4 +3532,11 @@ function upgrade_113_to_114() { $ph1ent['iketype'] = 'ikev1'; } +function upgrade_114_to_115() { + global $config; + + if (isset($config['unbound']['custom_options'])) + $config['unbound']['custom_options'] = base64_encode($config['unbound']['custom_options']); +} + ?> |
