diff options
Diffstat (limited to 'app/im')
| -rw-r--r-- | app/im/config/synapse/homeserver.yaml | 21 | ||||
| -rw-r--r-- | app/im/deploy/im.hcl | 84 |
2 files changed, 20 insertions, 85 deletions
diff --git a/app/im/config/synapse/homeserver.yaml b/app/im/config/synapse/homeserver.yaml index 9e141d4..6482772 100644 --- a/app/im/config/synapse/homeserver.yaml +++ b/app/im/config/synapse/homeserver.yaml @@ -314,7 +314,7 @@ bcrypt_rounds: 12 # Allows users to register as guests without a password/email/etc, and # participate in rooms hosted on this server which have been made # accessible to anonymous users. -allow_guest_access: True +allow_guest_access: False # The list of identity servers trusted to verify third party # identifiers by this server. @@ -469,5 +469,20 @@ report_stats: false suppress_key_server_warning: true enable_group_creation: true -experimental_features: - spaces_enabled: true +#experimental_features: +# spaces_enabled: true + +presence: + enabled: false +limit_remote_rooms: + enabled: true + complexity: 3.0 + complexity_error: "Ce salon de discussion a trop d'activité, le serveur n'est pas assez puissant pour le rejoindre. N'hésitez pas à remonter l'information à l'équipe technique, nous pourrons ajuster la limitation au besoin." + admins_can_join: false +retention: + enabled: true + # no default policy for now, this is intended. + # DO NOT ADD ONE BECAUSE THIS IS DANGEROUS AND WILL DELETE CONTENT WE WANT TO KEEP! + purge_jobs: + - interval: 1d + diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl index b53645c..68eb9fd 100644 --- a/app/im/deploy/im.hcl +++ b/app/im/deploy/im.hcl @@ -86,7 +86,7 @@ job "im" { resources { cpu = 1000 - memory = 4000 + memory = 2000 } service { @@ -97,7 +97,7 @@ job "im" { "matrix", "traefik.enable=true", "traefik.frontend.entryPoints=https", - "traefik.frontend.rule=Host:im.deuxfleurs.fr;PathPrefix:/_matrix", + "traefik.frontend.rule=Host:im.deuxfleurs.fr;PathPrefix:/_matrix,/_synapse", "traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin: *", "traefik.frontend.priority=100" ] @@ -129,86 +129,6 @@ job "im" { } } - group "easybridge" { - count = 1 - - network { - port "api_port" { - static = 8321 - to = 8321 - } - port "web_port" { to = 8281 } - } - - task "easybridge" { - driver = "docker" - config { - image = "lxpz/easybridge_amd64:35" - ports = [ "api_port", "web_port" ] - volumes = [ - "secrets/conf:/data" - ] - args = [ "./easybridge", "-config", "/data/config.json" ] - } - - template { - data = file("../config/easybridge/registration.yaml.tpl") - destination = "secrets/conf/registration.yaml" - } - - template { - data = file("../config/easybridge/config.json.tpl") - destination = "secrets/conf/config.json" - } - - resources { - memory = 250 - cpu = 100 - } - - service { - name = "easybridge-api" - tags = ["easybridge-api"] - port = "api_port" - address_mode = "host" - check { - type = "tcp" - port = "api_port" - interval = "60s" - timeout = "5s" - check_restart { - limit = 3 - grace = "90s" - ignore_warnings = false - } - } - } - - service { - name = "easybridge-web" - tags = [ - "easybridge-web", - "traefik.enable=true", - "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:easybridge.deuxfleurs.fr", - ] - port = "web_port" - address_mode = "host" - check { - type = "tcp" - port = "web_port" - interval = "60s" - timeout = "5s" - check_restart { - limit = 3 - grace = "90s" - ignore_warnings = false - } - } - } - } - } - group "riotweb" { count = 1 |