webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed urlfilter custom black/white list database rebuilding

Browse Source
This commit is contained in:
Arne Fitzenreiter
2008-05-02 14:59:20 +02:00
parent 7936147cf3
commit 3fbe712245
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/urlfilter/makeconf.pl
View File

@@ -36,10 +36,6 @@ print FILE "}\n";
close FILE;
print "\n";
print "Building blacklist databases ";
system("$swroot/urlfilter/bin/prebuild.pl");
print "\n";
print "Creating custom directories ";
mkdir("$dbdir/custom");
mkdir("$dbdir/custom/allowed");
@@ -50,4 +46,8 @@ system("touch $dbdir/custom/blocked/domains");
system("touch $dbdir/custom/blocked/urls");
print "\n";
print "Building blacklist databases ";
system("$swroot/urlfilter/bin/prebuild.pl");
print "\n";
exit

5
config/urlfilter/prebuild.pl
View File

@@ -9,11 +9,6 @@ $dbdir="/var/ipfire/urlfilter/blacklists";
system("/usr/bin/squidGuard -C all");
if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
if (-e "$dbdir/custom/allowed/urls.db") { unlink("$dbdir/custom/allowed/urls.db"); }
if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
if (-e "$dbdir/custom/blocked/urls.db") { unlink("$dbdir/custom/blocked/urls.db"); }
system("chown -R nobody.nobody $dbdir");
&setpermissions ($dbdir);

16
html/cgi-bin/urlfilter.cgi
View File

@@ -353,15 +353,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
$filtersettings{'VALID'} = 'yes';
&savesettings;
system("chown -R nobody.nobody $dbdir");
if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
if (-e "$dbdir/custom/allowed/urls.db") { unlink("$dbdir/custom/allowed/urls.db"); }
if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
if (-e "$dbdir/custom/blocked/urls.db") { unlink("$dbdir/custom/blocked/urls.db"); }
&setpermissions ($dbdir);
system('/usr/local/bin/squidctrl restart >/dev/null 2>&1');
}
}
@@ -2542,6 +2533,13 @@ sub savesettings
delete $filtersettings{'BACKGROUND'};
delete $filtersettings{'UPDATEFILE'};
system("chown -R nobody.nobody $dbdir");
system('/usr/bin/squidGuard -C custom/allowed/domains >/dev/null 2>&1');
system('/usr/bin/squidGuard -C custom/allowed/urls >/dev/null 2>&1');
system('/usr/bin/squidGuard -C custom/blocked/domains >/dev/null 2>&1');
system('/usr/bin/squidGuard -C custom/blocked/urls >/dev/null 2>&1 ');
&setpermissions ($dbdir);
&General::writehash("${General::swroot}/urlfilter/settings", \%filtersettings);
}