diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-02-28 22:40:31 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-02-28 22:40:31 +0100 |
| commit | f0a527ac7fc95bbe5102ddf709a5c4b95d03609c (patch) | |
| tree | 5d20b4202884bcc23136555c180563fee4c6c5c8 | |
| parent | 155a9f7e4d96072c9a9afe35433b16156d5ddcb9 (diff) | |
| download | infrastructure-f0a527ac7fc95bbe5102ddf709a5c4b95d03609c.tar.gz infrastructure-f0a527ac7fc95bbe5102ddf709a5c4b95d03609c.zip | |
Fix configuration
| -rw-r--r-- | consul/configuration/chat/easybridge/registration.yaml.tpl | 2 | ||||
| -rw-r--r-- | consul/configuration/chat/synapse/homeserver.yaml | 2 | ||||
| -rw-r--r-- | nomad/chat.hcl | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/consul/configuration/chat/easybridge/registration.yaml.tpl index 0123bc3..006a968 100644 --- a/consul/configuration/chat/easybridge/registration.yaml.tpl +++ b/consul/configuration/chat/easybridge/registration.yaml.tpl @@ -1,5 +1,5 @@ id: Easybridge -url: http://easybridge.service.2.cluster.deuxfleurs.fr +url: http://easybridge-api.service.2.cluster.deuxfleurs.fr:8321 as_token: {{ key "secrets/chat/easybridge/as_token" | trimSpace }} hs_token: {{ key "secrets/chat/easybridge/hs_token" | trimSpace }} sender_localpart: _ezbr_ diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/consul/configuration/chat/synapse/homeserver.yaml index 87688a4..0534235 100644 --- a/consul/configuration/chat/synapse/homeserver.yaml +++ b/consul/configuration/chat/synapse/homeserver.yaml @@ -308,8 +308,8 @@ room_invite_state_types: # A list of application service config file to use app_service_config_files: - - "/etc/matrix-synapse/fb2mx_registration.yaml" - "/etc/matrix-synapse/easybridge_registration.yaml" + #- "/etc/matrix-synapse/fb2mx_registration.yaml" # macaroon_secret_key: <PRIVATE STRING> diff --git a/nomad/chat.hcl b/nomad/chat.hcl index 83cc141..ddbb825 100644 --- a/nomad/chat.hcl +++ b/nomad/chat.hcl @@ -195,7 +195,7 @@ job "chat" { task "easybridge" { driver = "docker" config { - image = "lxpz/easybridge_amd64:5" + image = "lxpz/easybridge_amd64:8" port_map { api_port = 8321 web_port = 8281 @@ -227,7 +227,8 @@ job "chat" { } resources { - memory = 50 + memory = 500 + cpu = 1000 network { port "api_port" { static = "8321" |