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

Replace some docker references with {{ devture_systemd_docker_base_host_command_docker }}

pull/3635/head
Slavi Pantaleev 1 год назад
Родитель
Сommit
08b29e9b92
2 измененных файлов: 4 добавлений и 4 удалений
  1. +2
    -2
      roles/custom/matrix-dendrite/templates/bin/create-account.j2
  2. +2
    -2
      roles/custom/matrix-synapse/templates/synapse/bin/register-user.j2

+ 2
- 2
roles/custom/matrix-dendrite/templates/bin/create-account.j2 Просмотреть файл

@@ -11,7 +11,7 @@ password=$2
admin=$3

if [ "$admin" -eq "1" ]; then
docker exec matrix-dendrite create-account -config /data/dendrite.yaml -username "$user" -password "$password" -admin -url http://localhost:{{ matrix_dendrite_http_bind_port }}
{{ devture_systemd_docker_base_host_command_docker }} exec matrix-dendrite create-account -config /data/dendrite.yaml -username "$user" -password "$password" -admin -url http://localhost:{{ matrix_dendrite_http_bind_port }}
else
docker exec matrix-dendrite create-account -config /data/dendrite.yaml -username "$user" -password "$password" -url http://localhost:{{ matrix_dendrite_http_bind_port }}
{{ devture_systemd_docker_base_host_command_docker }} exec matrix-dendrite create-account -config /data/dendrite.yaml -username "$user" -password "$password" -url http://localhost:{{ matrix_dendrite_http_bind_port }}
fi

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

@@ -11,7 +11,7 @@ password=$2
admin=$3

if [ "$admin" -eq "1" ]; then
docker exec matrix-synapse register_new_matrix_user -u "$user" -p "$password" -c /data/homeserver.yaml --admin http://localhost:{{ matrix_synapse_container_client_api_port }}
{{ devture_systemd_docker_base_host_command_docker }} exec matrix-synapse register_new_matrix_user -u "$user" -p "$password" -c /data/homeserver.yaml --admin http://localhost:{{ matrix_synapse_container_client_api_port }}
else
docker exec matrix-synapse register_new_matrix_user -u "$user" -p "$password" -c /data/homeserver.yaml --no-admin http://localhost:{{ matrix_synapse_container_client_api_port }}
{{ devture_systemd_docker_base_host_command_docker }} exec matrix-synapse register_new_matrix_user -u "$user" -p "$password" -c /data/homeserver.yaml --no-admin http://localhost:{{ matrix_synapse_container_client_api_port }}
fi

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