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

Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr

Browse source
This commit is contained in:
Quentin 2020-09-21 16:30:23 +02:00
commit 6467a5ab31
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build/docker-compose.yml
View file

@ -7,8 +7,8 @@ services:
context: ./riotweb
args:
# https://github.com/vector-im/riot-web/releases
VERSION: 1.7.5
image: superboum/amd64_riotweb:v15
VERSION: 1.7.7
image: superboum/amd64_riotweb:v16
synapse:
build:

24
app/build/riotweb/config.json
View file

@ -1,24 +0,0 @@
{
"default_hs_url": "https://im.deuxfleurs.fr",
"default_is_url": "https://vector.im",
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,
"brand": "Deuxfleurs",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_groups": "labs",
"feature_pinning": "labs"
},
"default_federate": true,
"welcomePageUrl": "home.html",
"default_theme": "light",
"roomDirectory": {
"servers": [ "im.deuxfleurs.fr", "matrix.org" ]
}
}

34
app/config/configuration/chat/riot_web/config.json
View file

@ -1,6 +1,13 @@
{
"default_hs_url": "https://im.deuxfleurs.fr",
"default_is_url": "https://vector.im",
"default_server_config": {
"m.homeserver": {
"base_url": "https://im.deuxfleurs.fr",
"server_name": "deuxfleurs.fr"
},
"m.identity_server": {
"base_url": "https://vector.im"
}
},
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
@ -8,16 +15,33 @@
"brand": "Deuxfleurs",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"integrations_widgets_urls": [
"https://scalar.vector.im/_matrix/integrations/v1",
"https://scalar.vector.im/api",
"https://scalar-staging.vector.im/_matrix/integrations/v1",
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
"defaultCountryCode": "FR",
"showLabsSettings": true,
"features": {
"feature_new_spinner": true,
"feature_groups": "labs",
"feature_pinning": "labs"
},
"default_federate": true,
"welcomePageUrl": "home.html",
"default_theme": "light",
"roomDirectory": {
"servers": [ "im.deuxfleurs.fr", "matrix.org" ]
"servers": [
"deuxfleurs.fr",
"matrix.org",
"tedomum.net",
"zinz.dev"
]
},
"settingDefaults": {
"breadcrumbs": true
},
"jitsi": {
"preferredDomain": "jitsi.deuxfleurs.fr"

2
app/deployment/im.hcl
View file

@ -239,7 +239,7 @@ job "im" {
task "server" {
driver = "docker"
config {
image = "superboum/amd64_riotweb:v15"
image = "superboum/amd64_riotweb:v16"
port_map {
web_port = 8043
}