From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] guardian.cgi: Remove support for owncloud
Date: Wed, 27 Jun 2018 19:39:13 +0200
Message-ID: <20180627173914.4716-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9024263918676170507=="
List-Id: <development.lists.ipfire.org>

--===============9024263918676170507==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 html/cgi-bin/guardian.cgi | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi
index e15501ef5..6144aca02 100644
--- a/html/cgi-bin/guardian.cgi
+++ b/html/cgi-bin/guardian.cgi
@@ -52,7 +52,6 @@ my $ignorefile =3D'/var/ipfire/guardian/guardian.ignore';
 # file locations on IPFire systems.
 my %module_file_locations =3D (
 	"HTTPD" =3D> "/var/log/httpd/error_log",
-	"OWNCLOUD" =3D> "/var/owncloud/data/owncloud.log",
 	"SNORT" =3D> "/var/log/snort/alert",
 	"SSH" =3D> "/var/log/messages",
 );
@@ -65,11 +64,6 @@ our %mainsettings =3D ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/i=
nclude/colors.txt", \%color);
=20
-# Pakfire meta file for owncloud.
-# (File exists when the addon is installed.)
-my $owncloud_meta =3D "/opt/pakfire/db/installed/meta-owncloud";
-
-
 # File declarations.
 my $settingsfile =3D "${General::swroot}/guardian/settings";
 my $ignoredfile =3D "${General::swroot}/guardian/ignored";
@@ -96,11 +90,6 @@ $settings{'GUARDIAN_FIREWALL_ACTION'} =3D 'DROP';
 $settings{'GUARDIAN_LOGFILE'} =3D '/var/log/guardian/guardian.log';
 $settings{'GUARDIAN_SNORT_PRIORITY_LEVEL'} =3D '3';
=20
-# Default settings for owncloud if installed.
-if ( -e "$owncloud_meta") {
-	$settings{'GUARDIAN_MONITOR_OWNCLOUD'} =3D 'off';
-}
-
 my $errormessage =3D '';
=20
 &Header::showhttpheaders();
@@ -561,17 +550,7 @@ END
 				<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONITOR_HTT=
PD' value=3D'on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> /
 				<input type=3D'radio' name=3D'GUARDIAN_MONITOR_HTTPD' value=3D'off' $che=
cked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td>
 			</tr>
-END
=20
-			# Display owncloud checkbox when the addon is installed.
-			if ( -e "$owncloud_meta" ) {
-				print"<tr>\n";
-				print"<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian block ownclou=
d brute-force'}</td>\n";
-				print"<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONIT=
OR_OWNCLOUD' value=3D'on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n";
-				print"<input type=3D'radio' name=3D'GUARDIAN_MONITOR_OWNCLOUD' value=3D'=
off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n";
-				print"</tr>\n";
-			}
-	print <<END;
 			<tr>
 				<td colspan=3D'2'><br></td>
 			</tr>
--=20
2.17.1


--===============9024263918676170507==--