This one applied cleanly.
On Tue, 2017-10-10 at 15:31 +0200, Peter Müller wrote:
Remove configuration lines in Apache vhosts files which are not used anymore (old dial.cgi stuff).
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 6f353962e..e9ad26a96 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -39,17 +39,6 @@ <Files webaccess.cgi> Require all granted </Files>
<Files dial.cgi>
Require user admin
</Files>
</Directory>
- <Directory /srv/web/ipfire/cgi-bin/dial>
AllowOverride None
Options None
AuthName "IPFire - Restricted"
AuthType Basic
AuthUserFile /var/ipfire/auth/users
Require user dial admin
</Directory> <Files ~ "\.(cgi|shtml?)$"> SSLOptions +StdEnvVars
diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf index 619f90fcc..27fd25a95 100644 --- a/config/httpd/vhosts.d/ipfire-interface.conf +++ b/config/httpd/vhosts.d/ipfire-interface.conf @@ -31,17 +31,6 @@ <Files webaccess.cgi> Require all granted </Files>
<Files dial.cgi>
Require user admin
</Files>
</Directory>
- <Directory /srv/web/ipfire/cgi-bin/dial>
AllowOverride None
Options None
AuthName "IPFire - Restricted"
AuthType Basic
AuthUserFile /var/ipfire/auth/users
Require user dial admin
</Directory> Alias /updatecache/ /var/updatecache/ <Directory /var/updatecache>