webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2019-04-11 07:31:11 +02:00
parent a2907cdd9f ee82349a0e
commit d27675b081
6 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/131/filelists/files
View File

@@ -15,8 +15,10 @@ srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/ids.dat
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/bin/ipsec-interfaces
usr/local/bin/sshctrl
usr/local/bin/suricatactrl
usr/local/bin/update-ids-ruleset
usr/sbin/convert-snort

39
config/suricata/convert-snort
View File

@@ -231,6 +231,9 @@ if (-f $snort_rules_tarball) {
} else {
# Check if enought disk space is available.
if(&IDS::checkdiskspace()) {
# Print error message.
print "Could not download ruleset - Not enough free diskspace available.\n";
} else {
# Call the download function and grab the new ruleset.
&IDS::downloadruleset();
}
@@ -250,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.
#
@@ -295,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.
#