diff options
| author | jim-p <jimp@netgate.com> | 2019-03-12 14:41:55 -0400 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2019-03-12 14:42:29 -0400 |
| commit | f1caf190d5b5b0ca3cbd08e0f4db18a4f2763fa0 (patch) | |
| tree | 4d111cc5d0cb5d50ee715a072bf620c1d47696d5 /src/etc | |
| parent | 428f6f021c65ed612833eb4343bf103113059f9e (diff) | |
| download | pfsense-f1caf190d5b5b0ca3cbd08e0f4db18a4f2763fa0.zip pfsense-f1caf190d5b5b0ca3cbd08e0f4db18a4f2763fa0.tar.gz | |
Remove unnecessary expiretable cron jobs for ssh/gui lockout. Issue #9223
(cherry picked from commit 397d9fff6df234d98ef2353b0b29912a14777442)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 6d082a0..f1cc340 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -69,7 +69,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "19.0", + "latest_config" => "19.1", "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", "wan_interface_name" => "wan", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 97fb3d6..56230b0 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5934,6 +5934,14 @@ function upgrade_189_to_190() { } } +/* sshguard cron jobs are not necessary. + * See https://redmine.pfsense.org/issues/9223 */ +function upgrade_190_to_191() { + global $config; + install_cron_job("/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshguard", false, null, null, null, null, null, null, false); + install_cron_job("/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout", false, null, null, null, null, null, null, false); +} + /* * Special function that is called independent of current config version. It's * a workaround to have config_upgrade running on older versions after next |
