Skip to content

Commit

Permalink
Enable federation on Matrix server
Browse files Browse the repository at this point in the history
Co-authored-by: Nikhil Jha <[email protected]>
  • Loading branch information
encadyma and nikhiljha committed May 1, 2020
1 parent fa9b7bd commit 8593634
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions config.riot.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"default_server_config": {
"m.homeserver": {
"base_url": "https://matrix.ocf.berkeley.edu",
"server_name": "matrix.ocf.berkeley.edu"
"server_name": "ocf.berkeley.edu"
},
"m.identity_server": {
"base_url": "https://vector.im"
Expand Down Expand Up @@ -35,11 +35,11 @@
"default_theme": "dark",
"roomDirectory": {
"servers": [
"matrix.ocf.berkeley.edu",
"ocf.berkeley.edu",
"matrix.org"
]
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
}
}
}
4 changes: 2 additions & 2 deletions kubernetes/secrets/synapse-config/homeserver.yaml.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server_name: "matrix.ocf.berkeley.edu"
server_name: "ocf.berkeley.edu"
pid_file: /data/homeserver.pid
public_baseurl: https://matrix.ocf.berkeley.edu/

Expand Down Expand Up @@ -49,7 +49,7 @@ macaroon_secret_key: "<%= macaroon_secret_key %>"

form_secret: "<%= form_secret %>"

signing_key_path: "/etc/matrix-shared/matrix.ocf.berkeley.edu.signing.key"
signing_key_path: "/etc/matrix-shared/ocf.berkeley.edu.signing.key"

trusted_key_servers:
- server_name: "matrix.org"
Expand Down

0 comments on commit 8593634

Please sign in to comment.