aboutsummaryrefslogtreecommitdiff
path: root/app/build
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-09-21 16:30:23 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-09-21 16:30:23 +0200
commit6467a5ab3146605d378ee2bd134588f15bbea2f4 (patch)
tree33746c60e2a03636c008e03550b70a457552d5e5 /app/build
parent9e4e2f7b99ab8816afcf51e9575d75ccf73fb23f (diff)
parentf8682668c210fe0a5585620adf0ad498f7370bec (diff)
downloadinfrastructure-6467a5ab3146605d378ee2bd134588f15bbea2f4.tar.gz
infrastructure-6467a5ab3146605d378ee2bd134588f15bbea2f4.zip
Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr
Diffstat (limited to 'app/build')
-rw-r--r--app/build/docker-compose.yml4
-rw-r--r--app/build/riotweb/config.json24
2 files changed, 2 insertions, 26 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index b10445a..d96833c 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -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:
diff --git a/app/build/riotweb/config.json b/app/build/riotweb/config.json
deleted file mode 100644
index 8ce8e4c..0000000
--- a/app/build/riotweb/config.json
+++ /dev/null
@@ -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" ]
- }
-}
-