finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put mx-puppet-skype configs in ./config directory, not ./data

Browse Source
This commit is contained in:
Slavi Pantaleev 2020-04-09 09:44:10 +03:00
parent 5b8f8bc942
commit c1a66d3422
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-bridge-mx-puppet-skype/defaults/main.yml
View File

@ -9,7 +9,7 @@ matrix_mx_puppet_skype_docker_image: "sorunome/mx-puppet-skype:latest"
matrix_mx_puppet_skype_docker_image_force_pull: "{{ matrix_mx_puppet_skype_docker_image.endswith(':latest') }}" matrix_mx_puppet_skype_docker_image_force_pull: "{{ matrix_mx_puppet_skype_docker_image.endswith(':latest') }}"
matrix_mx_puppet_skype_base_path: "{{ matrix_base_data_path }}/mx-puppet-skype" matrix_mx_puppet_skype_base_path: "{{ matrix_base_data_path }}/mx-puppet-skype"
matrix_mx_puppet_skype_config_path: "{{ matrix_mx_puppet_skype_base_path }}/data" matrix_mx_puppet_skype_config_path: "{{ matrix_mx_puppet_skype_base_path }}/config"
matrix_mx_puppet_skype_data_path: "{{ matrix_mx_puppet_skype_base_path }}/data" matrix_mx_puppet_skype_data_path: "{{ matrix_mx_puppet_skype_base_path }}/data"
matrix_mx_puppet_skype_docker_src_files_path: "{{ matrix_mx_puppet_skype_base_path }}/docker-src" matrix_mx_puppet_skype_docker_src_files_path: "{{ matrix_mx_puppet_skype_base_path }}/docker-src"

2
roles/matrix-bridge-mx-puppet-skype/tasks/init.yml
View File

@ -7,7 +7,7 @@
matrix_synapse_container_extra_arguments: > matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }} {{ matrix_synapse_container_extra_arguments|default([]) }}
+ +
["--mount type=bind,src={{ matrix_mx_puppet_skype_config_path }}/skype-registration.yaml,dst=/matrix-mx-puppet-skype-registration.yaml,ro"] ["--mount type=bind,src={{ matrix_mx_puppet_skype_config_path }}/registration.yaml,dst=/matrix-mx-puppet-skype-registration.yaml,ro"]
matrix_synapse_app_service_config_files: > matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }} {{ matrix_synapse_app_service_config_files|default([]) }}

2
roles/matrix-bridge-mx-puppet-skype/tasks/setup_install.yml
View File

@ -75,7 +75,7 @@
- name: Ensure mx-puppet-skype skype-registration.yaml installed - name: Ensure mx-puppet-skype skype-registration.yaml installed
copy: copy:
content: "{{ matrix_mx_puppet_skype_registration|to_nice_yaml }}" content: "{{ matrix_mx_puppet_skype_registration|to_nice_yaml }}"
dest: "{{ matrix_mx_puppet_skype_config_path }}/skype-registration.yaml" dest: "{{ matrix_mx_puppet_skype_config_path }}/registration.yaml"
mode: 0644 mode: 0644
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_username }}" group: "{{ matrix_user_username }}"

3
roles/matrix-bridge-mx-puppet-skype/templates/systemd/matrix-mx-puppet-skype.service.j2
View File

@ -22,6 +22,9 @@ ExecStart=/usr/bin/docker run --rm --name matrix-mx-puppet-skype \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \ --cap-drop=ALL \
--network={{ matrix_docker_network }} \ --network={{ matrix_docker_network }} \
-e CONFIG_PATH=/config/config.yaml \
-e REGISTRATION_PATH=/config/registration.yaml \
-v {{ matrix_mx_puppet_skype_config_path }}:/config:z \
-v {{ matrix_mx_puppet_skype_data_path }}:/data:z \ -v {{ matrix_mx_puppet_skype_data_path }}:/data:z \
{% for arg in matrix_mx_puppet_skype_container_extra_arguments %} {% for arg in matrix_mx_puppet_skype_container_extra_arguments %}
{{ arg }} \ {{ arg }} \