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

Fix configuration

Browse source
This commit is contained in:
Alex 2020-02-28 22:40:31 +01:00
parent 155a9f7e4d
commit f0a527ac7f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
consul/configuration/chat/easybridge/registration.yaml.tpl
View file

@ -1,5 +1,5 @@
id: Easybridge 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 }} as_token: {{ key "secrets/chat/easybridge/as_token" | trimSpace }}
hs_token: {{ key "secrets/chat/easybridge/hs_token" | trimSpace }} hs_token: {{ key "secrets/chat/easybridge/hs_token" | trimSpace }}
sender_localpart: _ezbr_ sender_localpart: _ezbr_

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

@ -308,8 +308,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"
- "/etc/matrix-synapse/easybridge_registration.yaml" - "/etc/matrix-synapse/easybridge_registration.yaml"
#- "/etc/matrix-synapse/fb2mx_registration.yaml"
# macaroon_secret_key: <PRIVATE STRING> # macaroon_secret_key: <PRIVATE STRING>

5
nomad/chat.hcl
View file

@ -195,7 +195,7 @@ job "chat" {
task "easybridge" { task "easybridge" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/easybridge_amd64:5" image = "lxpz/easybridge_amd64:8"
port_map { port_map {
api_port = 8321 api_port = 8321
web_port = 8281 web_port = 8281
@ -227,7 +227,8 @@ job "chat" {
} }
resources { resources {
memory = 50 memory = 500
cpu = 1000
network { network {
port "api_port" { port "api_port" {
static = "8321" static = "8321"