From 52c1c5637f58450aba5574bd3000959c7d1ac65f Mon Sep 17 00:00:00 2001
From: Nikhil Jha <njha@ocf.berkeley.edu>
Date: Wed, 29 Apr 2020 17:07:12 -0700
Subject: [PATCH] switch to ocf.berkeley.edu

---
 config.riot.json | 6 +++---
 homeserver.yaml  | 6 +++---
 2 files changed, 6 insertions(+), 6 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/homeserver.yaml b/homeserver.yaml
index fc395d3..9da1518 100644
--- a/homeserver.yaml
+++ b/homeserver.yaml
@@ -7,7 +7,7 @@
 # e.g. matrix.org, localhost:8080, etc.
 # This is also the last part of your UserID.
 #
-server_name: "matrix.ocf.berkeley.edu"
+server_name: "ocf.berkeley.edu"
 
 # When running as a daemon, the file to store the pid in
 #
@@ -570,7 +570,7 @@ database:
 # A yaml python logging config file as described by
 # https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
 #
-log_config: "/data/matrix.ocf.berkeley.edu.log.config"
+log_config: "/data/ocf.berkeley.edu.log.config"
 
 
 ## Ratelimiting ##
@@ -1121,7 +1121,7 @@ form_secret: "loG32N*yCgr;Pp.Ih1l_fuw#G:0ii@D8J0cuPbed#-o25:sKLX"
 
 # Path to the signing key to sign messages with
 #
-signing_key_path: "/data/matrix.ocf.berkeley.edu.signing.key"
+signing_key_path: "/data/ocf.berkeley.edu.signing.key"
 
 # The keys that the server used to sign messages with but won't use
 # to sign new messages.