From patchwork Thu Jun 28 03:39:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 1843 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id ABCA460AB9 for ; Wed, 27 Jun 2018 19:39:23 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id 13B4C11278E3; Wed, 27 Jun 2018 18:39:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530121163; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=6E7DIpSFE2sgyb9DQY3k9ksKx4Ed5fiOM4+RUSCkpNQ=; b=F5t2J67OKkVrs3ZqTGuQGzdH1dH2c3YfjPJ8CLXf15nvXOYSDMPy9dU6Z8nqPsFlWbKO7b 9GTQ6hpr5dNYhJvVkueR3+MK1vKtjnF9ax+HSDZUspAjNT2qouBE2UUDnjS0aztAwqgStt 2Obge/QUOsv4bMkx36qK1K5yLkipLU8yFGSIw3eDbIrjtLfLz8ltXEmLsX4lA3FjUqk7H3 qOKOvdawInugaMF7220iVURGC46GAVEXInUxX6jR9OlCmVMkfeKaKgJLJIvMNBIRJZwt83 qz1nqpQGVr6P0oekXOogWtSbnEChsOPozZWIJFRnTwlcy1KN+ZXJgLDm6dygzg== Received: from tuxedo.stevee (212095005218.public.telering.at [212.95.5.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 67E1B1093712; Wed, 27 Jun 2018 18:39:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530121160; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=6E7DIpSFE2sgyb9DQY3k9ksKx4Ed5fiOM4+RUSCkpNQ=; b=uaWlcuK11vB7ZPlIKBwXTEl7QKp4VSx6YeOYnnp9f1kAO2FsjqX3qe6jEBArNAnLIAy9Yz GQNxfw/YMQe2vD5Lvc7MSb/Q2NCYLcN+OaVl/FBhdhuJ0Ga1ET+wC+Ccl2IQ/nKLY/OkZP rJI3RgJegKE6qX8AlakPTEO57KomMC5et46mj17lRI7ABQ/kjktPfY5Aqvh7K0W9K9afmb 3jzmxUihecoQW3/cCKo5G388rsQxp84KHDwSE0qlVwpyWDlkj01rrKqL7u0IfH4V52Vw8h vSfMXmO/dm6vklxLVZBJO5rkmcojL5xvAYHepM/iTpRR3tGoCCbyPla4fMWrHQ== From: Stefan Schantl 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> X-Mailer: git-send-email 2.17.1 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-2.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:8412, ipnet:212.95.0.0/19, country:AT]; FROM_HAS_DN(0.00)[] X-Spam-Status: No, score=-2.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 ='/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 on / off -END - # Display owncloud checkbox when the addon is installed. - if ( -e "$owncloud_meta" ) { - print"\n"; - print"$Lang::tr{'guardian block owncloud brute-force'}\n"; - print"on /\n"; - print" off\n"; - print"\n"; - } - print <