From patchwork Tue Sep 26 01:59:14 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@link38.eu>
X-Patchwork-Id: 1428
Return-Path: <development-bounces@lists.ipfire.org>
Received: from mail01.ipfire.org (unknown [172.28.1.200])
	by web02.ipfire.org (Postfix) with ESMTP id 59DB361038
	for <patchwork@ipfire.org>; Mon, 25 Sep 2017 17:59:24 +0200 (CEST)
Received: from mail01.ipfire.org (localhost [IPv6:::1])
	by mail01.ipfire.org (Postfix) with ESMTP id BA7DC171E;
	Mon, 25 Sep 2017 17:59:23 +0200 (CEST)
Received: from mx.link38.eu (mx.link38.eu [188.68.43.123])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
	bits)) (No client certificate requested)
	by mail01.ipfire.org (Postfix) with ESMTPS id 729D810D1
	for <development@lists.ipfire.org>;
	Mon, 25 Sep 2017 17:59:21 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at mx.link38.eu
Received: from mx-fra.brokers.link38.eu (mx-fra.brokers.link38.eu
	[10.141.75.13])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
	bits)) (Client did not present a certificate)
	by mx.link38.eu (Postfix) with ESMTPS id 44FB640ADA
	for <development@lists.ipfire.org>;
	Mon, 25 Sep 2017 17:59:15 +0200 (CEST)
Received: from [127.0.0.1] (localhost [127.0.0.1])
	(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256
	bits)) (Client did not present a certificate)
	by mx-fra.brokers.link38.eu (Postfix) with ESMTPSA id 8815A9F23C
	for <development@lists.ipfire.org>;
	Mon, 25 Sep 2017 17:59:14 +0200 (CEST)
Date: Mon, 25 Sep 2017 17:59:14 +0200
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: "development@lists.ipfire.org" <development@lists.ipfire.org>
Subject: [PATCH] remove unused directories from Apache vhost configs
Message-ID: <20170925175914.7215dd7a.peter.mueller@link38.eu>
Organization: Link38
MIME-Version: 1.0
X-BeenThere: development@lists.ipfire.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: IPFire development talk <development.lists.ipfire.org>
List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>,
	<mailto:development-request@lists.ipfire.org?subject=unsubscribe>
List-Archive: <http://lists.ipfire.org/pipermail/development/>
List-Post: <mailto:development@lists.ipfire.org>
List-Help: <mailto:development-request@lists.ipfire.org?subject=help>
List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>,
	<mailto:development-request@lists.ipfire.org?subject=subscribe>
Errors-To: development-bounces@lists.ipfire.org
Sender: "Development" <development-bounces@lists.ipfire.org>

Remove unused vhost configuration directives.

They are related to "dial.cgi" and /cgi-bin/dial/, which
both do not exist in IPFire.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>

diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index bec0d580b..eef2d45e2 100644
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -45,29 +45,12 @@
         <Files webaccess.cgi>
             Require all granted
         </Files>
-        <Files dial.cgi>
-			<RequireAll>
-	  	  	    Require user admin
-				Require ssl
-			</RequireAll>
-        </Files>
-    </Directory>
-    <Directory /srv/web/ipfire/cgi-bin/dial>
-        AllowOverride None
-        Options None
-        AuthName "IPFire - Restricted"
-        AuthType Basic
-        AuthUserFile /var/ipfire/auth/users
-        <RequireAll>
-	        Require user admin dial
-			Require ssl
-		</RequireAll>
     </Directory>
     <Files ~ "\.(cgi|shtml?)$">
-	SSLOptions +StdEnvVars
+		SSLOptions +StdEnvVars
     </Files>
     <Directory /srv/web/ipfire/cgi-bin>
-	SSLOptions +StdEnvVars
+		SSLOptions +StdEnvVars
     </Directory>
     SetEnv HOME /home/nobody
     SetEnvIf User-Agent ".*MSIE.*" \
diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf
index a0537b392..57cf8ba17 100644
--- a/config/httpd/vhosts.d/ipfire-interface.conf
+++ b/config/httpd/vhosts.d/ipfire-interface.conf
@@ -25,13 +25,6 @@
 		RewriteCond %{HTTPS} off
 		RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
     </Directory>
-    <Directory /srv/web/ipfire/cgi-bin/dial>
-        AllowOverride None
-        Options SymLinksIfOwnerMatch
-		RewriteEngine on
-		RewriteCond %{HTTPS} off
-		RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
-    </Directory>
     Alias /updatecache/ /var/updatecache/
 	<Directory /var/updatecache>
 		 Options ExecCGI