Просмотр исходного кода

Upgrade Synapse (v0.33.5.1 -> v0.33.7rc2)

We skipped v0.33.6 because of matrix-org/synapse#4014,
but v0.33.7rc2 fixed the problem.
pull/14/head
Slavi Pantaleev 7 лет назад
Родитель
Сommit
6cc528ba5a
3 измененных файлов: 3 добавлений и 5 удалений
  1. +1
    -1
      roles/matrix-server/defaults/main.yml
  2. +0
    -1
      roles/matrix-server/templates/synapse/homeserver.yaml.j2
  3. +2
    -3
      roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2

+ 1
- 1
roles/matrix-server/defaults/main.yml Просмотреть файл

@@ -134,7 +134,7 @@ matrix_docker_image_postgres_v9: "postgres:9.6.10-alpine"
matrix_docker_image_postgres_v10: "postgres:10.5-alpine" matrix_docker_image_postgres_v10: "postgres:10.5-alpine"
matrix_docker_image_postgres_latest: "{{ matrix_docker_image_postgres_v10 }}" matrix_docker_image_postgres_latest: "{{ matrix_docker_image_postgres_v10 }}"


matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.5.1"
matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.7rc2"
matrix_docker_image_nginx: "nginx:1.15.5-alpine" matrix_docker_image_nginx: "nginx:1.15.5-alpine"
matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.4" matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.4"
matrix_docker_image_goofys: "cloudproto/goofys:latest" matrix_docker_image_goofys: "cloudproto/goofys:latest"


+ 0
- 1
roles/matrix-server/templates/synapse/homeserver.yaml.j2 Просмотреть файл

@@ -590,7 +590,6 @@ email:
require_transport_security: false require_transport_security: false
notif_from: "Matrix <{{ matrix_mailer_sender_address }}>" notif_from: "Matrix <{{ matrix_mailer_sender_address }}>"
app_name: Matrix app_name: Matrix
template_dir: /synapse/res/templates
notif_template_html: notif_mail.html notif_template_html: notif_mail.html
notif_template_text: notif_mail.txt notif_template_text: notif_mail.txt
notif_for_new_users: True notif_for_new_users: True


+ 2
- 3
roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2 Просмотреть файл

@@ -10,8 +10,7 @@ password=$2
admin=$3 admin=$3


if [ "$admin" -eq "1" ]; then if [ "$admin" -eq "1" ]; then
docker exec matrix-synapse register_new_matrix_user -a -u $user -p $password -c /data/homeserver.yaml http://localhost:8008
docker exec matrix-synapse register_new_matrix_user -u $user -p $password -c /data/homeserver.yaml --admin http://localhost:8008
else else
# If `-a` is not passed, we need to answer to an "admin: yes/no" question
echo 'no' | docker exec -i matrix-synapse register_new_matrix_user -u $user -p $password $extraFlags -c /data/homeserver.yaml http://localhost:8008
docker exec matrix-synapse register_new_matrix_user -u $user -p $password -c /data/homeserver.yaml --no-admin http://localhost:8008
fi fi

Загрузка…
Отмена
Сохранить