mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
guardian.cgi: Remove support for owncloud
Owncloud as an addon has been dropped for IPFire. As a result of this, we do not need this code anymore. Fixes #11572. Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
committed by
Michael Tremer
parent
b4208f1845
commit
a4a1f16c17
@@ -52,7 +52,6 @@ my $ignorefile ='/var/ipfire/guardian/guardian.ignore';
|
||||
# file locations on IPFire systems.
|
||||
my %module_file_locations = (
|
||||
"HTTPD" => "/var/log/httpd/error_log",
|
||||
"OWNCLOUD" => "/var/owncloud/data/owncloud.log",
|
||||
"SNORT" => "/var/log/snort/alert",
|
||||
"SSH" => "/var/log/messages",
|
||||
);
|
||||
@@ -65,11 +64,6 @@ our %mainsettings = ();
|
||||
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
|
||||
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
|
||||
|
||||
# Pakfire meta file for owncloud.
|
||||
# (File exists when the addon is installed.)
|
||||
my $owncloud_meta = "/opt/pakfire/db/installed/meta-owncloud";
|
||||
|
||||
|
||||
# File declarations.
|
||||
my $settingsfile = "${General::swroot}/guardian/settings";
|
||||
my $ignoredfile = "${General::swroot}/guardian/ignored";
|
||||
@@ -96,11 +90,6 @@ $settings{'GUARDIAN_FIREWALL_ACTION'} = 'DROP';
|
||||
$settings{'GUARDIAN_LOGFILE'} = '/var/log/guardian/guardian.log';
|
||||
$settings{'GUARDIAN_SNORT_PRIORITY_LEVEL'} = '3';
|
||||
|
||||
# Default settings for owncloud if installed.
|
||||
if ( -e "$owncloud_meta") {
|
||||
$settings{'GUARDIAN_MONITOR_OWNCLOUD'} = 'off';
|
||||
}
|
||||
|
||||
my $errormessage = '';
|
||||
|
||||
&Header::showhttpheaders();
|
||||
@@ -561,17 +550,7 @@ END
|
||||
<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> /
|
||||
<input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='off' $checked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td>
|
||||
</tr>
|
||||
END
|
||||
|
||||
# Display owncloud checkbox when the addon is installed.
|
||||
if ( -e "$owncloud_meta" ) {
|
||||
print"<tr>\n";
|
||||
print"<td width='25%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n";
|
||||
print"<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n";
|
||||
print"<input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n";
|
||||
print"</tr>\n";
|
||||
}
|
||||
print <<END;
|
||||
<tr>
|
||||
<td colspan='2'><br></td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user