[chat] Synapse finally accepts my registration file...

5 files changed, 21 insertions, 5 deletions

diff --git a/consul/configuration/chat/fb2mx/config.yaml b/consul/configuration/chat/fb2mx/config.yaml
index 1e2860f..751ca22 100644
--- a/consul/configuration/chat/fb2mx/config.yaml
+++ b/consul/configuration/chat/fb2mx/config.yaml
@@ -39,7 +39,7 @@ appservice:
 
     # Community ID for bridged users (changes registration file) and rooms.
     # Must be created manually.
-    community_id: "fbusers"
+    community_id: "+fbusers@deuxfleurs.fr"
 
     # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
     as_token: "This value is generated when generating the registration"
diff --git a/consul/configuration/chat/fb2mx/registration.yaml b/consul/configuration/chat/fb2mx/registration.yaml
index bbd4293..c3d8c05 100644
--- a/consul/configuration/chat/fb2mx/registration.yaml
+++ b/consul/configuration/chat/fb2mx/registration.yaml
@@ -5,7 +5,7 @@ namespaces:
     users:
     - exclusive: true
       regex: '@facebook_.+:deuxfleurs.fr'
-      group_id: fbusers
+      group_id: '+fbusers:deuxfleurs.fr'
 url: http://fb2mx.service.2.cluster.deuxfleurs.fr:29319
 sender_localpart: facebookbot
 rate_limited: false
diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/consul/configuration/chat/synapse/homeserver.yaml
index 119dd7c..9e0e97f 100644
--- a/consul/configuration/chat/synapse/homeserver.yaml
+++ b/consul/configuration/chat/synapse/homeserver.yaml
@@ -307,7 +307,8 @@ room_invite_state_types:
 
 
 # A list of application service config file to use
-app_service_config_files: []
+app_service_config_files: 
+    - "/etc/matrix-synapse/fb2mx_registration.yaml"
 
 
 # macaroon_secret_key: <PRIVATE STRING>
@@ -402,4 +403,8 @@ password_config:
 #   notif_template_html: notif_mail.html
 #   notif_template_text: notif_mail.txt
 #   notif_for_new_users: True
+
+# Key that had to be added after some synapse updates to please matrix developers...
 report_stats: false
+suppress_key_server_warning: true
+enable_group_creation: true
diff --git a/consul/restore_configuration.sh b/consul/restore_configuration.sh
index ba4d353..33742e5 100755
--- a/consul/restore_configuration.sh
+++ b/consul/restore_configuration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-find {configuration,secrets} -type f \
+find {configuration,secrets}/$1 -type f \
   | grep --perl-regexp --invert-match "\.sample$|\.gen$|/.gitignore$" \
   | while read filename; do
       consul kv put "${filename}" "@${filename}"
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index 50c657b..a0c5397 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -29,7 +29,7 @@ job "chat" {
       }
       
       artifact {
-        source = "http://127.0.0.1:8500/v1/kv/configuration/chat/synapse/homeserver.yaml?raw&a=a"
+        source = "http://127.0.0.1:8500/v1/kv/configuration/chat/synapse/homeserver.yaml?raw"
         destination = "secrets/tpl/homeserver.yaml.tpl"
         mode = "file"
       }
@@ -37,6 +37,17 @@ job "chat" {
         source = "secrets/tpl/homeserver.yaml.tpl"
         destination = "secrets/conf/homeserver.yaml"
       }
+
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/registration.yaml?raw"
+        destination = "secrets/tpl/fb2mx_registration.yaml.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/tpl/fb2mx_registration.yaml.tpl"
+        destination = "secrets/conf/fb2mx_registration.yaml"
+      }
+
       template {
         data = "{{ key \"configuration/chat/synapse/log.yaml\" }}"
         destination = "secrets/conf/log.yaml"