aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2019-12-09 16:18:48 +0100
committerQuentin <quentin@deuxfleurs.fr>2019-12-09 16:18:48 +0100
commitb33e289d996e8c69fef82d02e665f3fb87d894fa (patch)
treed98c2f9f877a98967275059f1e3ad80657e87df6
parent73a0697e0fdbd3a9a5a9c963b5c654ce9f9bccc2 (diff)
downloadinfrastructure-b33e289d996e8c69fef82d02e665f3fb87d894fa.tar.gz
infrastructure-b33e289d996e8c69fef82d02e665f3fb87d894fa.zip
[synapse] Docker update from 1.4.0rc1 to 1.7.0rc1
-rw-r--r--consul/configuration/chat/fb2mx/config.yaml4
-rw-r--r--docker/matrix-synapse/Dockerfile2
-rw-r--r--docker/matrix-synapse/README.md2
-rw-r--r--man/create_database/README.md (renamed from doc/create_database/README.md)0
-rw-r--r--man/init_stolon/README.md (renamed from doc/init_stolon/README.md)0
-rw-r--r--nomad/chat.hcl64
6 files changed, 68 insertions, 4 deletions
diff --git a/consul/configuration/chat/fb2mx/config.yaml b/consul/configuration/chat/fb2mx/config.yaml
index 51684e3..964c681 100644
--- a/consul/configuration/chat/fb2mx/config.yaml
+++ b/consul/configuration/chat/fb2mx/config.yaml
@@ -42,8 +42,8 @@ appservice:
community_id: "+fbusers:deuxfleurs.fr"
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
- as_token: "This value is generated when generating the registration"
- hs_token: "This value is generated when generating the registration"
+ as_token: '{{ key "secrets/chat/fb2mx/as_token" | trimSpace }}'
+ hs_token: '{{ key "secrets/chat/fb2mx/hs_token" | trimSpace }}'
# Bridge config
bridge:
diff --git a/docker/matrix-synapse/Dockerfile b/docker/matrix-synapse/Dockerfile
index ee12e0d..140304d 100644
--- a/docker/matrix-synapse/Dockerfile
+++ b/docker/matrix-synapse/Dockerfile
@@ -1,6 +1,6 @@
FROM amd64/debian:stretch as builder
-ENV VERSION 1.4.0rc1
+ENV VERSION 1.7.0rc1
RUN apt-get update && \
apt-get -qq -y full-upgrade && \
diff --git a/docker/matrix-synapse/README.md b/docker/matrix-synapse/README.md
index 922530f..2aed6cf 100644
--- a/docker/matrix-synapse/README.md
+++ b/docker/matrix-synapse/README.md
@@ -1,3 +1,3 @@
```
-docker build -t superboum/amd64_synapse:v22 .
+docker build -t superboum/amd64_synapse:v23 .
```
diff --git a/doc/create_database/README.md b/man/create_database/README.md
index 7084a10..7084a10 100644
--- a/doc/create_database/README.md
+++ b/man/create_database/README.md
diff --git a/doc/init_stolon/README.md b/man/init_stolon/README.md
index fe3a912..fe3a912 100644
--- a/doc/init_stolon/README.md
+++ b/man/init_stolon/README.md
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index a0c5397..3df61ae 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -113,7 +113,71 @@ job "chat" {
}
}
}
+/*
+ group "facebook_bridge" {
+ count = 1
+ task "fb2mx" {
+ driver = "docker"
+ config {
+ # https://mau.dev/tulir/mautrix-facebook/container_registry
+ image = "dock.mau.dev/tulir/mautrix-facebook:latest"
+ port_map {
+ api_port = 29319
+ }
+ volumes = [
+ "secrets/conf:/data"
+ ]
+ }
+
+ resources {
+ memory = 50
+ network {
+ port "api_port" {
+ static = "29319"
+ }
+ }
+ }
+
+ service {
+ tags = ["mxbridge"]
+ port = "api_port"
+ address_mode = "host"
+ name = "fb2mx"
+ check {
+ type = "tcp"
+ port = "api_port"
+ interval = "60s"
+ timeout = "5s"
+ check_restart {
+ limit = 3
+ grace = "90s"
+ ignore_warnings = false
+ }
+ }
+ }
+
+ artifact {
+ source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/registration.yaml?raw"
+ destination = "secrets/tpl/registration.yaml.tpl"
+ mode = "file"
+ }
+ template {
+ source = "secrets/tpl/registration.yaml.tpl"
+ destination = "secrets/conf/registration.yaml"
+ }
+ artifact {
+ source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/config.yaml?raw"
+ destination = "secrets/tpl/config.yaml.tpl"
+ mode = "file"
+ }
+ template {
+ source = "secrets/tpl/config.yaml.tpl"
+ destination = "secrets/conf/config.yaml"
+ }
+ }
+ }
+*/
group "riotweb" {
count = 1