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

Switch to an env file

pull/1771/head
Julian-Samuel Gebühr 3 лет назад
Родитель
Сommit
773fe64cef
4 измененных файлов: 19 добавлений и 6 удалений
  1. +4
    -0
      roles/matrix-bot-matrix-registration-bot/defaults/main.yml
  2. +8
    -0
      roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
  3. +6
    -0
      roles/matrix-bot-matrix-registration-bot/templates/env.j2
  4. +1
    -6
      roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2

+ 4
- 0
roles/matrix-bot-matrix-registration-bot/defaults/main.yml Просмотреть файл

@@ -14,6 +14,10 @@ matrix_bot_matrix_registration_bot_docker_image_force_pull: "{{ matrix_bot_matri
matrix_bot_matrix_registration_bot_base_path: "{{ matrix_base_data_path }}/matrix-registration-bot"
matrix_bot_matrix_registration_bot_config_path: "{{ matrix_bot_matrix_registration_bot_base_path }}/config"

matrix_bot_matrix_registration_bot_bot_server: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_matrix_registration_bot_api_base_url: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_matrix_registration_bot_logging_level: info

# A list of extra arguments to pass to the container
matrix_bot_matrix_registration_bot_container_extra_arguments: []



+ 8
- 0
roles/matrix-bot-matrix-registration-bot/tasks/setup_install.yml Просмотреть файл

@@ -12,6 +12,14 @@
- {path: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}", when: true}
when: "item.when|bool"

- name: Ensure matrix-registration-bot environment variables file created
template:
src: "{{ role_path }}/templates/env.j2"
dest: "{{ matrix_bot_matrix_registration_bot_config_path }}/env"
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
mode: 0640

- name: Ensure matrix-registration-bot image is pulled
docker_image:
name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"


+ 6
- 0
roles/matrix-bot-matrix-registration-bot/templates/env.j2 Просмотреть файл

@@ -0,0 +1,6 @@
BOT_SERVER={{ matrix_bot_matrix_registration_bot_bot_server }}
BOT_USERNAME={{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}
BOT_PASSWORD={{ matrix_bot_matrix_registration_bot_matrix_user_password }}
API_BASE_URL={{ matrix_bot_matrix_registration_bot_api_base_url }}
API_TOKEN={{ matrix_bot_matrix_registration_bot_matrix_admin_token }}
LOGGING_LEVEL={{ matrix_bot_matrix_registration_bot_logging_level }}

+ 1
- 6
roles/matrix-bot-matrix-registration-bot/templates/systemd/matrix-bot-matrix-registration-bot.service.j2 Просмотреть файл

@@ -20,12 +20,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-matrix-reg
--log-driver=none \
--cap-drop=ALL \
--network={{ matrix_docker_network }} \
-e 'BOT_SERVER=https://{{ matrix_server_fqn_matrix }}' \
-e 'BOT_USERNAME={{ matrix_bot_matrix_registration_bot_matrix_user_id_localpart }}' \
-e 'BOT_PASSWORD={{ matrix_bot_matrix_registration_bot_matrix_user_password }}' \
-e 'API_BASE_URL=https://{{ matrix_server_fqn_matrix }}' \
-e 'API_TOKEN={{ matrix_bot_matrix_registration_bot_matrix_admin_token }}' \
-e 'LOGGING_LEVEL=info' \
--env-file={{ matrix_bot_matrix_registration_bot_config_path }}/env \
{{ matrix_bot_matrix_registration_bot_docker_image }}

ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-matrix-registration-bot 2>/dev/null || true'


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