diff options
| author | Renato Botelho <renato@netgate.com> | 2015-07-15 13:42:22 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-15 13:42:22 -0300 |
| commit | 2a323a0e26f769ad71ca75763fe88812d24c1acf (patch) | |
| tree | f1f76faf0d824439bb88642b0d9e81ddbb2460a0 /config/snort/snort_post_install.php | |
| parent | d80e45e5c937c8b7c2571da35c5beab17b667f6d (diff) | |
| parent | 4106c494cdc49668e23a4bae378edc69521468bb (diff) | |
| download | pfsense-packages-2a323a0e26f769ad71ca75763fe88812d24c1acf.tar.gz pfsense-packages-2a323a0e26f769ad71ca75763fe88812d24c1acf.tar.bz2 pfsense-packages-2a323a0e26f769ad71ca75763fe88812d24c1acf.zip | |
Merge pull request #900 from bmeeks8/snort-3.2.6
Diffstat (limited to 'config/snort/snort_post_install.php')
| -rw-r--r-- | config/snort/snort_post_install.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php index 7b931246..280f0efe 100644 --- a/config/snort/snort_post_install.php +++ b/config/snort/snort_post_install.php @@ -85,6 +85,9 @@ conf_mount_rw(); @rename("{$snortdir}/gen-msg.map-sample", "{$snortdir}/gen-msg.map"); //@rename("{$snortdir}/attribute_table.dtd-sample", "{$snortdir}/attribute_table.dtd"); +/* Move deprecated_rules file to SNORTDIR/rules directory */ +@rename("/usr/local/pkg/snort/deprecated_rules", "{$snortdir}/rules/deprecated_rules"); + /* fix up the preprocessor rules filenames from a PBI package install */ $preproc_rules = array("decoder.rules", "preprocessor.rules", "sensitive-data.rules"); foreach ($preproc_rules as $file) { @@ -245,9 +248,8 @@ if ($config['installedpackages']['snortglobal']['forcekeepsettings'] == 'on') { if (!($g['booting'])) { if ($pkg_interface <> "console") { update_status(gettext("Starting Snort using rebuilt configuration...")); - update_output_window(gettext("Please wait while Snort is started...")); - mwexec("{$rcdir}snort.sh start"); - update_output_window(gettext("Snort has been started using the rebuilt configuration...")); + mwexec_bg("{$rcdir}snort.sh start"); + update_output_window(gettext("Snort is starting as a background task using the rebuilt configuration...")); } else mwexec_bg("{$rcdir}snort.sh start"); @@ -263,8 +265,8 @@ if (stristr($config['widgets']['sequence'], "snort_alerts-container") === FALSE) $config['widgets']['sequence'] .= ",{$snort_widget_container}"; /* Update Snort package version in configuration */ -$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.5"; -write_config("Snort pkg v3.2.5: post-install configuration saved."); +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.6"; +write_config("Snort pkg v3.2.6: post-install configuration saved."); /* Done with post-install, so clear flag */ unset($g['snort_postinstall']); |