From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] remove unused directories from Apache vhost configs Date: Mon, 09 Oct 2017 15:32:31 +0100 Message-ID: <1507559551.4045.20.camel@ipfire.org> In-Reply-To: <20170925175914.7215dd7a.peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2169856017703848254==" List-Id: --===============2169856017703848254== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Hi, this patch doesn't apply against next? Could you please rebase it? On Mon, 2017-09-25 at 17:59 +0200, Peter Müller wrote: > 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 > --- > 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 @@ > > Require all granted > > - > - > - Require user admin > - Require ssl I think that line doesn't exist in next. > - > - > - > - > - AllowOverride None > - Options None > - AuthName "IPFire - Restricted" > - AuthType Basic > - AuthUserFile /var/ipfire/auth/users > - > - Require user admin dial > - Require ssl > - > > > - SSLOptions +StdEnvVars > + SSLOptions +StdEnvVars Indentation has also changed here. > > > - SSLOptions +StdEnvVars > + SSLOptions +StdEnvVars And here. > > 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] > > - > - AllowOverride None > - Options SymLinksIfOwnerMatch > - RewriteEngine on > - RewriteCond %{HTTPS} off > - RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L] > - > Alias /updatecache/ /var/updatecache/ > > Options ExecCGI -Michael --===============2169856017703848254== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxuYmlJQUFDZ2tRZ0hudy8yK1EKQ1FmbG5CQUFoUTVyazhYRVJ5 UjQraG1rWFB1eGpvYUd5aUlHTWJVcEZzbnlBVDE3d1VvcW9KMVV2TVRsWXRNYwp0eXlpaloxOURS d2Zwb1p2ckZuc0U0UUtud1NPNFdxaUZ5MEVRbTdic1VCRmIvTFBBTU16RmpPVVo5b3V4eHZTCkRo RUc3TUd3ZUtNN1RDdlZZZENNN1k1L3hiM2RDdDdZZ1V4TGhqRzFtdDhoTjBlTGtYWnZheGl4M2Vi WmZmYUcKNVlvUHloN0IwMWMrUEc5QW94ZkZpcFpraXNId3l2R3hKZ2dYRnIyOVBOQ3Uvc3Nhek4r SWY5RDNMMGhzbXhNdAo4Z0l5b3F0MVBXa1VNankvU05ud2tnbHZlK1pORTBSVzVJU0Z1K3hCY1J0 UzlLSXZESVhKY0R0NURjVUxiUEk1CldzSlFJbjZHeFJ3MmRoYnYyQmJod1RrR3JDSmJYVmtCTzdJ MHpuRkNvOWtIZW5sQWdLZmdxdzNTQTFIUFVYSnMKa0dkKzFUMDdoNXhQWXJTTFVoWTh2WXVPKzRy VkRXaWFEK0tkMGZTOWtrUmNjblJPMmZuMmtQQyt6UHAwMnJnZwp3VVRtK0xWR0tpcFprM2hqUHRD NHNtcGZDcll0dDhFN0lHMWxUb1JYeHAzc2NzSnErajNXYTB6SmJRVGZaWFhGCnpWcWRBT2ZocnFI NGY1ZkZkNVAwV0gxM1ZHVUhMVjYwL29aTEQrbHkxWktleDBHQ2E2T3oxYVRsVHBmMjVHUHQKMGtZ ZFMxRTZtNVN3NUc5aXZvQ3JOUVUrUTU3V25RSGVpV09uRE1EVW81WmZwMXpMTGcxMU9lZ1JyRkFP STBxRApaSkRDTVhDMnFCWEJYWG5aa3BtRDkwSHVGaG51bmdia0lCV2p0djNsanJzQ3J0QjNueVk9 Cj1qUE9wCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============2169856017703848254==--