From 8593634d7e6c455f1edba53e1d49f235d73b85e7 Mon Sep 17 00:00:00 2001
From: encadyma <encadyma@gmail.com>
Date: Thu, 30 Apr 2020 23:21:01 -0700
Subject: [PATCH] Enable federation on Matrix server

Co-authored-by: Nikhil Jha <njha@ocf.berkeley.edu>
---
 config.riot.json                                      | 6 +++---
 kubernetes/secrets/synapse-config/homeserver.yaml.erb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.riot.json b/config.riot.json
index bd6bd85..0ee78a5 100644
--- a/config.riot.json
+++ b/config.riot.json
@@ -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"
@@ -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
     }
-}
\ No newline at end of file
+}
diff --git a/kubernetes/secrets/synapse-config/homeserver.yaml.erb b/kubernetes/secrets/synapse-config/homeserver.yaml.erb
index 98cf246..758be2c 100644
--- a/kubernetes/secrets/synapse-config/homeserver.yaml.erb
+++ b/kubernetes/secrets/synapse-config/homeserver.yaml.erb
@@ -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/
 
@@ -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"