Matrix Federation #953
Merged
Merged
Conversation
Contributor
Errored hosts (0)Changed hosts (2)Unaffected hosts (128)Changed hostsdiff for death.ocf.berkeley.edu, dev-death.ocf.berkeley.edu*******************************************
Apache::Vhost[www] =>
parameters =>
aliases =>
+ [{"alias"=>"/.well-known/matrix/server", "path"=>"/var/www/html/.well-known/matrix/server"}]
*******************************************
+ Concat::Fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"target": "25-www.conf"
*******************************************
Concat::Fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
+ Concat_fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"tag": "25-www.conf",
"target": "25-www.conf"
*******************************************
Concat_fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
+ File[/var/www/html/.well-known/matrix/server] =>
parameters =>
"backup": "main",
"content": "{\n \"m.server\": \"matrix.ocf.berkeley.edu:443\"\n}\n",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known/matrix] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************Unaffected hosts |
nikhiljha
approved these changes
Apr 29, 2020
| # ...hide ocfweb metrics | ||
| '%{REQUEST_URI} !^/metrics', | ||
| # ...and not if it's the matrix well-known file | ||
| '%{REQUEST_URI} !^/\.well-known/matrix', |
Member
There was a problem hiding this comment.
The indentation looked right when you were in vim but now it doesn't? Estoy confundido.
Contributor
Author
There was a problem hiding this comment.
I think the linter did that? I wonder if I try to fix it if it will do it again
cg505
approved these changes
Apr 30, 2020
Member
cg505
left a comment
cg505
left a comment
There was a problem hiding this comment.
good work! just formatting nits
| proxy_preserve_host => true, | ||
|
|
||
| aliases => [ | ||
| { alias => '/.well-known/matrix/server', |
Member
There was a problem hiding this comment.
should probably put alias on its own line to be consistent with the other sections
| # ...hide ocfweb metrics | ||
| '%{REQUEST_URI} !^/metrics', | ||
| # ...and not if it's the matrix well-known file | ||
| '%{REQUEST_URI} !^/\.well-known/matrix', |
encadyma
approved these changes
Apr 30, 2020
Contributor
Author
|
Thanks for handling @cg505 :) |
Member
|
it didn't work tho :( |
Contributor
Errored hosts (0)Changed hosts (3)Unaffected hosts (127)Changed hostsdiff for dev-fallingrocks.ocf.berkeley.edu*******************************************
Exec[systemctl-daemon-reload] =>
parameters =>
path =>
- /opt/share/utils/bin:/opt/share/utils/sbin:/usr/local/sbin:/usr/local/bin:/opt/puppetlabs/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ /opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*******************************************diff for dev-death.ocf.berkeley.edu*******************************************
Apache::Vhost[www] =>
parameters =>
aliases =>
+ [{"alias"=>"/.well-known/matrix/server", "path"=>"/var/www/html/.well-known/matrix/server"}]
*******************************************
+ Concat::Fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"target": "25-www.conf"
*******************************************
Concat::Fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
+ Concat_fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"tag": "25-www.conf",
"target": "25-www.conf"
*******************************************
Concat_fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
Exec[systemctl-daemon-reload] =>
parameters =>
path =>
- /opt/share/utils/bin:/opt/share/utils/sbin:/usr/local/sbin:/usr/local/bin:/opt/puppetlabs/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ /opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
*******************************************
+ File[/var/www/html/.well-known/matrix/server] =>
parameters =>
"backup": "main",
"content": "{\n \"m.server\": \"matrix.ocf.berkeley.edu:443\"\n}\n",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known/matrix] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************diff for death.ocf.berkeley.edu*******************************************
Apache::Vhost[www] =>
parameters =>
aliases =>
+ [{"alias"=>"/.well-known/matrix/server", "path"=>"/var/www/html/.well-known/matrix/server"}]
*******************************************
+ Concat::Fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"target": "25-www.conf"
*******************************************
Concat::Fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
+ Concat_fragment[www-aliases] =>
parameters =>
"content": " ## Alias declarations for resources outside the DocumentRoot\n...
"order": 20,
"tag": "25-www.conf",
"target": "25-www.conf"
*******************************************
Concat_fragment[www-rewrite] =>
parameters =>
content =>
@@ -9,4 +9,5 @@
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !^/metrics
+ RewriteCond %{REQUEST_URI} !^/\.well-known/matrix
RewriteRule ^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]
_
*******************************************
+ File[/var/www/html/.well-known/matrix/server] =>
parameters =>
"backup": "main",
"content": "{\n \"m.server\": \"matrix.ocf.berkeley.edu:443\"\n}\n",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known/matrix] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************
+ File[/var/www/html/.well-known] =>
parameters =>
"backup": "main",
"ensure": "directory",
"group": "root",
"mode": "0644",
"owner": "root"
*******************************************Unaffected hosts |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Changes
Addresses ocf/matrix#1