From patchwork Thu Aug 5 13:28:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4602 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GgTvy1R8vz3xGv for ; Thu, 5 Aug 2021 13:28:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GgTvw5b5rz2M9; Thu, 5 Aug 2021 13:28:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GgTvw4bpMz2yRd; Thu, 5 Aug 2021 13:28:44 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GgTvt5p0Tz2xLV for ; Thu, 5 Aug 2021 13:28:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GgTvt0Wtqzjv; Thu, 5 Aug 2021 13:28:42 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628170122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=a59kJnGoSpGoZPvMq+ZB4Jq8kzBpFVf5yB2k7VRykwk=; b=rT3wVQg8DrHF5IC8I2eygXi1v1EhxXBmrn8Y4cpd/khkoz6ktL4D6qN/B93M2IrXTkvr9N lfQr3tP/AVJgVHAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628170122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=a59kJnGoSpGoZPvMq+ZB4Jq8kzBpFVf5yB2k7VRykwk=; b=a1F5udXQFusrIJzxPVI+NwMjScAqFNjgAM1MmoGVJgc+DYG7KN/gUzZxNMH76woqi0mp+t hNSwHYMgusbxsDkjVmRzsZIhfoTBqf76f4c2egMNsBPk6m0itLhO2NgirusswNh9zSOERF ofIWLuOwFe1lbv2jyFEdZ4VnICQFbYJuWDyloLHCEEnOY1rnDWB1IVkbf5CELec9r1nma4 QvM2Y7Or5Fsl7j/1c5qsG3yV7ThKDkUwW702GZn9IHPNs4SE6g6VqMoTSnFqF4Fgtkb+nI YHmg7TYKxnY1l9VOn/GFBWnGdeKB1qFgbGQN9Ih0yfZLdQTnrLeSOmZVuxxD3w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] No longer disable proxy when GREEN isn't present Date: Thu, 5 Aug 2021 13:28:30 +0000 Message-Id: <20210805132832.7645-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/cfgroot/header.pl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 83ef01951..79accbe8a 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -181,13 +181,6 @@ sub genmenu { $menu->{'03.network'}{'subMenu'}->{'80.macadressmenu'}{'enabled'} = 0; $menu->{'03.network'}{'subMenu'}->{'90.wakeonlan'}{'enabled'} = 0; } - - # Disable proxy when no GREEN is available - if (!&green_used()) { - $menu->{'03.network'}{'subMenu'}->{'20.proxy'}{'enabled'} = 0; - $menu->{'03.network'}{'subMenu'}->{'21.urlfilter'}{'enabled'} = 0; - $menu->{'03.network'}{'subMenu'}->{'22.updxlrator'}{'enabled'} = 0; - } } }