Move appservice-registration.irc.yaml.erb -> synapse-config

ocf · May 1, 2020 · fa9b7bd · fa9b7bd
1 parent 0076237
commit fa9b7bd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 servicePipeline(
-    upstreamProjects: ['dockers/master'],
+    upstreamProjects: [],
 )
 
 // vim: ft=groovy
diff --git a/...nfig/appservice-registration-irc.yaml.erb → ...nfig/appservice-registration-irc.yaml.erb b/...nfig/appservice-registration-irc.yaml.erb → ...nfig/appservice-registration-irc.yaml.erb
diff --git a/kubernetes/secrets/synapse-config/homeserver.yaml.erb b/kubernetes/secrets/synapse-config/homeserver.yaml.erb
@@ -43,7 +43,7 @@ enable_metrics: true
 report_stats: false
 
 app_service_config_files:
-  - /etc/matrix-bridge/appservice-registration-irc.yaml
+  - /etc/matrix-synapse/appservice-registration-irc.yaml
 
 macaroon_secret_key: "<%= macaroon_secret_key %>"
 

diff --git a/kubernetes/synapse.yml.erb b/kubernetes/synapse.yml.erb
@@ -37,9 +37,6 @@ spec:
             - name: synapse-config
               mountPath: /etc/matrix-synapse
               readOnly: true
-            - name: bridge-config
-              mountPath: /etc/matrix-bridge
-              readOnly: true
             - name: matrix-secrets
               mountPath: /etc/matrix-shared
               readOnly: true
@@ -53,9 +50,6 @@ spec:
         - name: synapse-config
           secret:
             secretName: synapse-config
-        - name: bridge-config
-          secret:
-            secretName: bridge-config
         - name: matrix-secrets
           hostPath:
             path: /opt/share/kubernetes/secrets/matrix