fix: don't redirect on ocf.b.e #1251
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Errored hosts (0)Changed hosts (1)Unaffected hosts (80)Changed hostsdiff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www-https-redirect] =>
parameters =>
directories =>
+ [{"path"=>"/.well-known/matrix/server", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}, {"path"=>"/.well-known/matrix/client", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}]
*******************************************
Concat::Fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,15 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
+
+ <Location "/.well-known/matrix/client">
+ Require all granted
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************
Concat_fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,15 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
+
+ <Location "/.well-known/matrix/client">
+ Require all granted
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************Unaffected hosts |
Errored hosts (0)Changed hosts (1)Unaffected hosts (80)Changed hostsdiff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www] =>
parameters =>
serveraliases =>
- ["dev-www.ocf.berkeley.edu"]
+ ["dev-www.ocf.berkeley.edu", "ocf.berkeley.edu"]
*******************************************
Concat::Fragment[www-serveralias] =>
parameters =>
content =>
@@ -2,2 +2,3 @@
## Server aliases
ServerAlias dev-www.ocf.berkeley.edu
+ ServerAlias ocf.berkeley.edu
*******************************************
Concat_fragment[www-serveralias] =>
parameters =>
content =>
@@ -2,2 +2,3 @@
## Server aliases
ServerAlias dev-www.ocf.berkeley.edu
+ ServerAlias ocf.berkeley.edu
*******************************************Unaffected hosts |
Errored hosts (0)Changed hosts (1)Unaffected hosts (80)Changed hostsdiff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www-http-redirect] =>
parameters =>
redirectmatch_regexp =>
- ^(.*)
+ ^((?!\/\.well-known\/matrix\/(client|server)).*)
*******************************************
Apache::Vhost[www-https-redirect] =>
parameters =>
directories =>
+ [{"path"=>"/.well-known/matrix/server", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}, {"path"=>"/.well-known/matrix/client", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}]
*******************************************
Concat::Fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat::Fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,15 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
+
+ <Location "/.well-known/matrix/client">
+ Require all granted
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************
Concat_fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat_fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,15 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
+
+ <Location "/.well-known/matrix/client">
+ Require all granted
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************Unaffected hosts |
not necessary
Errored hosts (0)Changed hosts (1)Unaffected hosts (80)Changed hostsdiff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www-http-redirect] =>
parameters =>
redirectmatch_regexp =>
- ^(.*)
+ ^((?!\/\.well-known\/matrix\/(client|server)).*)
*******************************************
Apache::Vhost[www-https-redirect] =>
parameters =>
directories =>
+ [{"path"=>"/.well-known/matrix/server", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}]
*******************************************
Concat::Fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat::Fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,8 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************
Concat_fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat_fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,8 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/server">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************Unaffected hosts |
Errored hosts (0)Changed hosts (1)Unaffected hosts (80)Changed hostsdiff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www-http-redirect] =>
parameters =>
redirectmatch_regexp =>
- ^(.*)
+ ^((?!\/\.well-known\/matrix\/(client|server)).*)
*******************************************
Apache::Vhost[www-https-redirect] =>
parameters =>
directories =>
+ [{"path"=>"/.well-known/matrix/client", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}]
*******************************************
Apache::Vhost[www] =>
parameters =>
directories =>
- [{"path"=>"/.well-known/matrix/server", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}, {"path"=>"/.well-known/matrix/client", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}, {"path"=>"/services/http/users", "provider"=>"directories", "directoryindex"=>"index.html index.cgi index.pl index.php index.xhtml index.htm index.shtm index.shtml", "options"=>["ExecCGI", "FollowSymLinks", "IncludesNoExec", "Indexes", "MultiViews", "SymLinksIfOwnerMatch"], "allow_override"=>["All"]}, {"path"=>"\\.(cgi|shtml|phtml|php)$", "provider"=>"filesmatch", "ssl_options"=>"+StdEnvVars"}, {"path"=>"\\.(php[3457]?|phtml|fcgi)$", "provider"=>"filesmatch", "sethandler"=>"fcgid-script"}, {"path"=>"/", "provider"=>"directories", "request_headers"=>"edit* Cookie (;?\\s*OCFWEB_.+?)=.+?(;|$) $1=REMOVED$2"}]
+ [{"path"=>"/.well-known/matrix/client", "provider"=>"location", "custom_fragment"=>"\n Header set Access-Control-Allow-Origin \"*\"\n "}, {"path"=>"/services/http/users", "provider"=>"directories", "directoryindex"=>"index.html index.cgi index.pl index.php index.xhtml index.htm index.shtm index.shtml", "options"=>["ExecCGI", "FollowSymLinks", "IncludesNoExec", "Indexes", "MultiViews", "SymLinksIfOwnerMatch"], "allow_override"=>["All"]}, {"path"=>"\\.(cgi|shtml|phtml|php)$", "provider"=>"filesmatch", "ssl_options"=>"+StdEnvVars"}, {"path"=>"\\.(php[3457]?|phtml|fcgi)$", "provider"=>"filesmatch", "sethandler"=>"fcgid-script"}, {"path"=>"/", "provider"=>"directories", "request_headers"=>"edit* Cookie (;?\\s*OCFWEB_.+?)=.+?(;|$) $1=REMOVED$2"}]
*******************************************
Concat::Fragment[www-directories] =>
parameters =>
content =>
@@ -2,11 +2,4 @@
## Directories, there should at least be a declaration for /services/http/users
_
- <Location "/.well-known/matrix/server">
- Require all granted
-____
- Header set Access-Control-Allow-Origin "*"
-________
- </Location>
-
<Location "/.well-known/matrix/client">
Require all granted
*******************************************
Concat::Fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat::Fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,8 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/client">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************
Concat_fragment[www-directories] =>
parameters =>
content =>
@@ -2,11 +2,4 @@
## Directories, there should at least be a declaration for /services/http/users
_
- <Location "/.well-known/matrix/server">
- Require all granted
-____
- Header set Access-Control-Allow-Origin "*"
-________
- </Location>
-
<Location "/.well-known/matrix/client">
Require all granted
*******************************************
Concat_fragment[www-http-redirect-redirect] =>
parameters =>
content =>
@@ -1,3 +1,3 @@
_
## RedirectMatch rules
- RedirectMatch 301 ^(.*) https://www.ocf.berkeley.edu$1
+ RedirectMatch 301 ^((?!\/\.well-known\/matrix\/(client|server)).*) https://www.ocf.berkeley.edu$1
*******************************************
Concat_fragment[www-https-redirect-directories] =>
parameters =>
content =>
@@ -2,7 +2,8 @@
## Directories, there should at least be a declaration for /var/www/html
_
- <Directory "/var/www/html">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
+ <Location "/.well-known/matrix/client">
Require all granted
- </Directory>
+____
+ Header set Access-Control-Allow-Origin "*"
+__________
+ </Location>
*******************************************Unaffected hosts |
Kalissaac
reviewed
Feb 3, 2023
|
i guess there's only one way to find out anyways.. |
singingtelegram
added a commit
that referenced
this pull request
Apr 30, 2023
* fix: don't redirect on ocf.b.e * fix: it's actually here, see if it works * fix: it works * fix: remove server cors not necessary * fix: wrong one
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.