Skip to content

Matrix Federation #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cg505 merged 4 commits into from
Apr 30, 2020
Merged

Matrix Federation #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5bafc9
Added matrix JSON file, modified apache config
expedited Apr 29, 2020
4e8b796
Changes to www.pp file
expedited Apr 29, 2020
3da0719
update formatting for www.pp
cg505 Apr 30, 2020
b7dfe42
for real this time
cg505 Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/ocf_www/files/matrix-server
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"m.server": "matrix.ocf.berkeley.edu:443"
}
16 changes: 16 additions & 0 deletions modules/ocf_www/manifests/site/www.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
include ocf_www::mod::php
include ocf_www::mod::suexec

file {
['/var/www/html/.well-known', '/var/www/html/.well-known/matrix']:
ensure => 'directory';
'/var/www/html/.well-known/matrix/server':
source => 'puppet:///modules/ocf_www/matrix-server';
}

# TODO: dev-death should add a robots.txt disallowing everything
apache::vhost { 'www':
servername => 'www.ocf.berkeley.edu',
Expand All @@ -42,6 +49,13 @@
request_headers => ['set X-Forwarded-Proto https'],
proxy_preserve_host => true,

aliases => [
{
alias => '/.well-known/matrix/server',
path => '/var/www/html/.well-known/matrix/server',
},
],

rewrites => [
{
comment => 'redirect .well-known/host-meta to mastodon',
Expand All @@ -56,6 +70,8 @@
'%{REQUEST_URI} !^/icons/',
# ...hide ocfweb metrics
'%{REQUEST_URI} !^/metrics',
# ...and not if it's the matrix well-known file
'%{REQUEST_URI} !^/\.well-known/matrix',
],
rewrite_rule => '^/(.*)$ http://lb.ocf.berkeley.edu:4080/$1 [P]',
}
Expand Down