diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-04-21 23:38:43 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-04-21 23:38:43 -0500 |
| commit | 6c7be4357862794d99dac605286ff7e3812f5797 (patch) | |
| tree | ba838164a0f9ff60842cafe16e61b123228b086d /src | |
| parent | b196692532c02fb90889f27512f1246b7805cc44 (diff) | |
| parent | bc247ad9e6990b81e9ba8d59e86c1487121f530e (diff) | |
| download | pfsense-6c7be4357862794d99dac605286ff7e3812f5797.zip pfsense-6c7be4357862794d99dac605286ff7e3812f5797.tar.gz | |
Merge pull request #2883 from NOYB/Periodic_RRD_&_DHCP_Leases_RAM_Disk_Backup
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 12 | ||||
| -rw-r--r-- | src/usr/local/www/system_advanced_misc.php | 11 |
4 files changed, 24 insertions, 3 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 3b76753..31dc971 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>15.1</version> + <version>15.2</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index e7c9543..d7e2b32 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" => "15.1", + "latest_config" => "15.2", "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 72b7c7a..08bd110 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4892,4 +4892,16 @@ function upgrade_150_to_151() { } } } + +function upgrade_151_to_152() { + global $g, $config; + + require_once("/etc/inc/services.inc"); + + // Remove these cron jobs on full install if not using ramdisk. + if (($g['platform'] == $g['product_name']) && !isset($config['system']['use_mfs_tmpvar'])) { + install_cron_job("/etc/rc.backup_rrd.sh", false); + install_cron_job("/etc/rc.backup_dhcpleases.sh", false); + } +} ?> diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index ff108d3..d690d38 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -277,7 +277,6 @@ if ($_POST) { } else { unset($config['system']['rrdbackup']); } - install_cron_job("/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}"); } if (isset($_POST['dhcpbackup'])) { if (($_POST['dhcpbackup'] > 0) && ($_POST['dhcpbackup'] <= 24)) { @@ -285,6 +284,16 @@ if ($_POST) { } else { unset($config['system']['dhcpbackup']); } + } + + // Add/Remove RAM disk periodic backup cron jobs according to settings and installation type. + // Remove the cron jobs on full install if not using RAM disk. + // Add the cron jobs on all others if the periodic backup option is set. Otherwise the cron job is removed. + if (($g['platform'] == $g['product_name']) && !isset($config['system']['use_mfs_tmpvar'])) { + install_cron_job("/etc/rc.backup_rrd.sh", false); + install_cron_job("/etc/rc.backup_dhcpleases.sh", false); + } else { + install_cron_job("/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}"); install_cron_job("/etc/rc.backup_dhcpleases.sh", ($config['system']['dhcpbackup'] > 0), $minute="0", "*/{$config['system']['dhcpbackup']}"); } |
