convert-snort: Re-order steps at end of script

This will ensure that the whole IDS is configured property, if
no or an empty snort config file is present.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Stefan Schantl
2019-04-08 20:20:18 +02:00
committed by Michael Tremer
parent e4bc9b8b6f
commit ee82349a0e

View File

@@ -253,7 +253,24 @@ if (-f $IDS::rulestarball) {
}
#
## Step 8: Grab used ruleset files from snort config file and convert
## Step 8: Generate file for the HOME Net.
#
# Call subfunction to generate the file.
&IDS::generate_home_net_file();
#
## Step 9: Setup automatic ruleset updates.
#
# Check if a ruleset is configured.
if($rulessettings{"RULES"}) {
# Call suricatactrl and setup the periodic update mechanism.
&IDS::call_suricatactrl("cron", $rulessettings{'AUTOUPDATE_INTERVAL'});
}
#
## Step 10: Grab used ruleset files from snort config file and convert
## them into the new format.
#
@@ -298,23 +315,6 @@ close(SNORTCONF);
# Pass the array of enabled rule files to the subfunction and write the file.
&IDS::write_used_rulefiles_file(@enabled_rule_files);
#
## Step 9: Generate file for the HOME Net.
#
# Call subfunction to generate the file.
&IDS::generate_home_net_file();
#
## Step 10: Setup automatic ruleset updates.
#
# Check if a ruleset is configured.
if($rulessettings{"RULES"}) {
# Call suricatactrl and setup the periodic update mechanism.
&IDS::call_suricatactrl("cron", $rulessettings{'AUTOUPDATE_INTERVAL'});
}
#
## Step 11: Start the IDS if enabled.
#