aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorQuentin <quentin@dufour.io>2021-01-29 15:53:37 +0100
committerQuentin <quentin@dufour.io>2021-01-29 15:53:37 +0100
commitcee95ad0616f9c55cea6917c88b49366304a7287 (patch)
tree69890df2d0e5be7804c8962eebddc381f69a2d04 /app
parent982efd1b49f7435f7c49c2099aabfc994d3901fb (diff)
parent24dcc096958799745a51abe06e2fe1712aaba940 (diff)
downloadinfrastructure-cee95ad0616f9c55cea6917c88b49366304a7287.tar.gz
infrastructure-cee95ad0616f9c55cea6917c88b49366304a7287.zip
Merge pull request 'Upgrade Synapse & Element-web, réécriture de l'OP guide, et ajout du secret turn.zinz.dev' (#33) from adrien/infrastructure:master into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/infrastructure/pulls/33
Diffstat (limited to 'app')
-rw-r--r--app/docker-compose.yml8
-rw-r--r--app/im/deploy/im.hcl4
-rw-r--r--app/im/secrets/chat/coturn/static_auth_secret_zinzdev1
3 files changed, 7 insertions, 6 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 717e8ce..9f50c26 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -14,16 +14,16 @@ services:
context: ./im/build/riotweb
args:
# https://github.com/vector-im/riot-web/releases
- VERSION: 1.7.16
- image: superboum/amd64_riotweb:v19
+ VERSION: 1.7.18
+ image: particallydone/amd64_riotweb:v20
synapse:
build:
context: ./im/build/matrix-synapse
args:
# https://github.com/matrix-org/synapse/releases
- VERSION: 1.25.0
- image: superboum/amd64_synapse:v40
+ VERSION: 1.26.0
+ image: particallydone/amd64_synapse:v41
# Email
sogo:
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index c9591e6..48181b7 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -15,7 +15,7 @@ job "im" {
driver = "docker"
config {
- image = "superboum/amd64_synapse:v40"
+ image = "particallydone/amd64_synapse:v41"
network_mode = "host"
readonly_rootfs = true
ports = [ "client_port", "federation_port" ]
@@ -220,7 +220,7 @@ job "im" {
task "server" {
driver = "docker"
config {
- image = "superboum/amd64_riotweb:v19"
+ image = "particallydone/amd64_riotweb:v20"
ports = [ "web_port" ]
volumes = [
"secrets/config.json:/srv/http/config.json"
diff --git a/app/im/secrets/chat/coturn/static_auth_secret_zinzdev b/app/im/secrets/chat/coturn/static_auth_secret_zinzdev
new file mode 100644
index 0000000..c61486d
--- /dev/null
+++ b/app/im/secrets/chat/coturn/static_auth_secret_zinzdev
@@ -0,0 +1 @@
+USER Serveur coturn (TURN/STUN) d'Adrien, c'est un jeton d'identification. \ No newline at end of file