adrien/infrastructure
1
0
Fork 0
forked from Deuxfleurs/infrastructure
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Quentin 2019-10-27 15:26:21 +01:00
parent 7a97bbe06c
commit 1850d9a653
5 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
consul/configuration/chat/fb2mx/config.yaml
View file

@ -39,7 +39,7 @@ appservice:
# Community ID for bridged users (changes registration file) and rooms. # Community ID for bridged users (changes registration file) and rooms.
# Must be created manually. # Must be created manually.
community_id: "fbusers" community_id: "+fbusers@deuxfleurs.fr"
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
as_token: "This value is generated when generating the registration" as_token: "This value is generated when generating the registration"

2
consul/configuration/chat/fb2mx/registration.yaml
View file

@ -5,7 +5,7 @@ namespaces:
users: users:
- exclusive: true - exclusive: true
regex: '@facebook_.+:deuxfleurs.fr' regex: '@facebook_.+:deuxfleurs.fr'
group_id: fbusers group_id: '+fbusers:deuxfleurs.fr'
url: http://fb2mx.service.2.cluster.deuxfleurs.fr:29319 url: http://fb2mx.service.2.cluster.deuxfleurs.fr:29319
sender_localpart: facebookbot sender_localpart: facebookbot
rate_limited: false rate_limited: false

7
consul/configuration/chat/synapse/homeserver.yaml
View file

@ -307,7 +307,8 @@ room_invite_state_types:
# A list of application service config file to use # 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> # macaroon_secret_key: <PRIVATE STRING>
@ -402,4 +403,8 @@ password_config:
# notif_template_html: notif_mail.html # notif_template_html: notif_mail.html
# notif_template_text: notif_mail.txt # notif_template_text: notif_mail.txt
# notif_for_new_users: True # notif_for_new_users: True
# Key that had to be added after some synapse updates to please matrix developers...
report_stats: false report_stats: false
suppress_key_server_warning: true
enable_group_creation: true

2
consul/restore_configuration.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
find {configuration,secrets} -type f \ find {configuration,secrets}/$1 -type f \
| grep --perl-regexp --invert-match "\.sample$|\.gen$|/.gitignore$" \ | grep --perl-regexp --invert-match "\.sample$|\.gen$|/.gitignore$" \
| while read filename; do | while read filename; do
consul kv put "${filename}" "@${filename}" consul kv put "${filename}" "@${filename}"

13
nomad/chat.hcl
View file

@ -29,7 +29,7 @@ job "chat" {
} }
artifact { 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" destination = "secrets/tpl/homeserver.yaml.tpl"
mode = "file" mode = "file"
} }
@ -37,6 +37,17 @@ job "chat" {
source = "secrets/tpl/homeserver.yaml.tpl" source = "secrets/tpl/homeserver.yaml.tpl"
destination = "secrets/conf/homeserver.yaml" 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 { template {
data = "{{ key \"configuration/chat/synapse/log.yaml\" }}" data = "{{ key \"configuration/chat/synapse/log.yaml\" }}"
destination = "secrets/conf/log.yaml" destination = "secrets/conf/log.yaml"