diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-17 16:17:03 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-17 16:17:03 -0200 |
| commit | 56c8376a9eabdc59e8f71535c0f3cd871cd776f1 (patch) | |
| tree | a2dd8765de1e2cb190e7dceb90a65984a033296d | |
| parent | aafa7657399edf835a28c106c37ac71cc9b24335 (diff) | |
| download | pfsense-56c8376a9eabdc59e8f71535c0f3cd871cd776f1.zip pfsense-56c8376a9eabdc59e8f71535c0f3cd871cd776f1.tar.gz | |
Add a cron item to expire items from webConfiguratorlockout, also add config upgrade code. This fixes #4122
| -rw-r--r-- | conf.default/config.xml | 11 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 14 |
2 files changed, 24 insertions, 1 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index e65d7a7..9470158 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>11.1</version> + <version>11.2</version> <lastchange/> <theme>pfsense_ng</theme> <system> @@ -178,6 +178,15 @@ <command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 sshlockout</command> </item> <item> + <minute>*/60</minute> + <hour>*</hour> + <mday>*</mday> + <month>*</month> + <wday>*</wday> + <who>root</who> + <command>/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout</command> + </item> + <item> <minute>1</minute> <hour>1</hour> <mday>*</mday> diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 7035a7c..d0e594f 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3486,4 +3486,18 @@ function upgrade_110_to_111() { unset($pkg, $new); } +function upgrade_111_to_112() { + global $config; + + $config['cron']['item'][] = array( + 'minute' => '*/60', + 'hour' => '*', + 'mday' => '*', + 'month' => '*', + 'wday' => '*', + 'who' => 'root', + 'command' => '/usr/bin/nice -n20 /usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout' + ); +} + ?> |
