mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-22 12:35:51 +00:00
Use non-root and no-capability containers during Discord setup
Related to #105 (Github Pull Request).
This commit is contained in:
parent
401d7560e9
commit
a310a01818
@ -35,24 +35,44 @@
|
|||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
when: "matrix_appservice_discord_enabled and matrix_appservice_discord_systemd_service_result.changed"
|
when: "matrix_appservice_discord_enabled and matrix_appservice_discord_systemd_service_result.changed"
|
||||||
|
|
||||||
- stat:
|
- name: Check if a matrix-appservice-discord registration file exists
|
||||||
|
stat:
|
||||||
path: "{{ matrix_appservice_discord_base_path }}/discord-registration.yaml"
|
path: "{{ matrix_appservice_discord_base_path }}/discord-registration.yaml"
|
||||||
register: appservice_discord_registration_file
|
register: appservice_discord_registration_file
|
||||||
|
|
||||||
- name: Generate matrix-appservice-discord discord-registration.yaml if it doesn't exist
|
- name: Generate matrix-appservice-discord discord-registration.yaml if it doesn't exist
|
||||||
shell: /usr/bin/docker run --rm --name matrix-appservice-discord-gen -v {{ matrix_appservice_discord_base_path }}:/data:z {{ matrix_appservice_discord_docker_image }} node build/src/discordas.js -r -u "http://matrix-appservice-discord:9005" -c /data/config.yaml -f /data/discord-registration.yaml -l discord_bot
|
shell: >-
|
||||||
when: "matrix_appservice_discord_enabled and appservice_discord_registration_file.stat.exists == False"
|
/usr/bin/docker run --rm --name matrix-appservice-discord-gen
|
||||||
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
|
--cap-drop=ALL
|
||||||
|
-v {{ matrix_appservice_discord_base_path }}:/data:z
|
||||||
|
{{ matrix_appservice_discord_docker_image }}
|
||||||
|
node build/src/discordas.js
|
||||||
|
-r
|
||||||
|
-u "http://matrix-appservice-discord:9005"
|
||||||
|
-c /data/config.yaml
|
||||||
|
-f /data/discord-registration.yaml
|
||||||
|
-l discord_bot
|
||||||
|
when: "matrix_appservice_discord_enabled and not appservice_discord_registration_file.stat.exists"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_synapse_app_service_config_file_appservice_discord: '{{ matrix_appservice_discord_base_path }}/discord-registration.yml'
|
matrix_synapse_app_service_config_file_appservice_discord: '{{ matrix_appservice_discord_base_path }}/discord-registration.yml'
|
||||||
|
|
||||||
- stat:
|
- name: Check if a matrix-appservice-discord invite_link file exists
|
||||||
|
stat:
|
||||||
path: "{{ matrix_appservice_discord_base_path }}/invite_link"
|
path: "{{ matrix_appservice_discord_base_path }}/invite_link"
|
||||||
register: appservice_discord_link_generated
|
register: appservice_discord_link_generated
|
||||||
|
|
||||||
- name: Generate your discord invite link invite link
|
- name: Generate your discord invite link
|
||||||
shell: /usr/bin/docker run --rm --name matrix-appservice-discord-link-gen -v {{ matrix_appservice_discord_base_path }}:/data -w /data {{ matrix_appservice_discord_docker_image }} /bin/sh -c "node .././build/tools/addbot.js > invite_link"
|
shell: >-
|
||||||
when: "matrix_appservice_discord_enabled and appservice_discord_link_generated.stat.exists == False"
|
/usr/bin/docker run --rm --name matrix-appservice-discord-link-gen
|
||||||
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
|
||||||
|
--cap-drop=ALL
|
||||||
|
-v {{ matrix_appservice_discord_base_path }}:/data
|
||||||
|
-w /data
|
||||||
|
{{ matrix_appservice_discord_docker_image }}
|
||||||
|
/bin/sh -c "node .././build/tools/addbot.js > invite_link"
|
||||||
|
when: "matrix_appservice_discord_enabled and not appservice_discord_link_generated.stat.exists"
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
matrix_synapse_container_additional_volumes: >
|
matrix_synapse_container_additional_volumes: >
|
||||||
|
Loading…
Reference in New Issue
Block a user