From: "Peter Müller" <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 [thread overview]
Message-ID: <20170925175914.7215dd7a.peter.mueller@link38.eu> (raw)
[-- Attachment #1: Type: text/plain, Size: 2038 bytes --]
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(a)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
next reply other threads:[~2017-09-25 15:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 15:59 Peter Müller [this message]
2017-10-09 14:32 ` Michael Tremer
2017-10-09 20:24 ` Peter Müller
2017-10-10 11:31 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170925175914.7215dd7a.peter.mueller@link38.eu \
--to=peter.mueller@link38.eu \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox