From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH] remove unused directories from Apache vhost configs
Date: Mon, 25 Sep 2017 17:59:14 +0200
Message-ID: <20170925175914.7215dd7a.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4441726261793543202=="
List-Id: <development.lists.ipfire.org>

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

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=C3=BCller <peter.mueller(a)link38.eu>
---
diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/v=
hosts.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/vhost=
s.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=3D301,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=3D301,L]
-    </Directory>
     Alias /updatecache/ /var/updatecache/
 	<Directory /var/updatecache>
 		 Options ExecCGI

--===============4441726261793543202==--