IDS: Introduce settingsdir variable

[ipfire-2.x.git] / config / cfgroot / ids-functions.pl

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 32002912d2d164a70bb64b17e44cf99a3b6ce786..74713d77ad9d8cde0068c5531b8ec624a04c6dbe 100644 (file)
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -26,6 +26,9 @@ package IDS;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 
+# Location where all config and settings files are stored.
+our $settingsdir = "${General::swroot}/snort";
+
 # Location and name of the tarball which contains the ruleset.
 our $rulestarball = "/var/tmp/snortrules.tar.gz";
 
@@ -81,11 +84,11 @@ sub checkdiskspace () {
 sub downloadruleset {
        # Get snort settings.
        my %snortsettings=();
-       &General::readhash("${General::swroot}/snort/settings", \%snortsettings);
+       &General::readhash("$settingsdir/settings", \%snortsettings);
 
        # Get all available ruleset locations.
        my %rulesetsources=();
-       &General::readhash("${General::swroot}/snort/ruleset-sources.list", \%rulesetsources);
+       &General::readhash("$settingsdir/ruleset-sources.list", \%rulesetsources);
 
        # Read proxysettings.
        my %proxysettings=();
@@ -164,7 +167,7 @@ sub oinkmaster () {
        openlog('oinkmaster', 'cons,pid', 'user');
 
        # Call oinkmaster to generate ruleset.
-       open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -v -s -u file://$rulestarball -C /var/ipfire/snort/oinkmaster.conf -o $rulespath|");
+       open(OINKMASTER, "/usr/local/bin/oinkmaster.pl -v -s -u file://$rulestarball -C $settingsdir/oinkmaster.conf -o $rulespath|");
 
        # Log output of oinkmaster to syslog.
        while(<OINKMASTER>) {