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

Rename variables having an incorrect prefix (matrix_bot_cactus_ -> matrix_cactus_)

Browse Source 
Looks like these variables were originally named this way in
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
This commit is contained in:
Slavi Pantaleev 2024-01-08 19:30:20 +02:00
parent b6916d3adc
commit 4011eaf258
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/custom/matrix-cactus-comments/defaults/main.yml
View File

@ -52,10 +52,10 @@ matrix_cactus_comments_client_nginx_path: "/cactus-comments/"
matrix_cactus_comments_client_endpoint: "/cactus-comments/" matrix_cactus_comments_client_endpoint: "/cactus-comments/"
# List of systemd services that matrix-cactus-comments.service depends on # List of systemd services that matrix-cactus-comments.service depends on
matrix_bot_cactus_comments_systemd_required_services_list: ['docker.service'] matrix_cactus_comments_systemd_required_services_list: ['docker.service']
# List of systemd services that matrix-cactus-comments.service wants # List of systemd services that matrix-cactus-comments.service wants
matrix_bot_cactus_comments_systemd_wanted_services_list: [] matrix_cactus_comments_systemd_wanted_services_list: []
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
matrix_cactus_comments_container_extra_arguments: [] matrix_cactus_comments_container_extra_arguments: []

12
roles/custom/matrix-cactus-comments/tasks/validate_config.yml
View File

@ -1,6 +1,6 @@
--- ---
- name: Fail if required settings not defined - name: Fail if required matrix-cactus-comments settings not defined
ansible.builtin.fail: ansible.builtin.fail:
msg: >- msg: >-
You need to define a required configuration setting (`{{ item }}`). You need to define a required configuration setting (`{{ item }}`).
@ -8,3 +8,13 @@
with_items: with_items:
- "matrix_cactus_comments_as_token" - "matrix_cactus_comments_as_token"
- "matrix_cactus_comments_hs_token" - "matrix_cactus_comments_hs_token"
- name: (Deprecation) Catch and report renamed matrix-cactus-comments settings
ansible.builtin.fail:
msg: >-
Your configuration contains a variable, which now has a different name.
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
when: "item.old in vars"
with_items:
- {'old': 'matrix_bot_cactus_comments_systemd_required_services_list', 'new': 'matrix_cactus_comments_systemd_required_services_list'}
- {'old': 'matrix_bot_cactus_comments_systemd_wanted_services_list', 'new': 'matrix_cactus_comments_systemd_wanted_services_list'}

4
roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2
View File

@ -1,11 +1,11 @@
#jinja2: lstrip_blocks: "True" #jinja2: lstrip_blocks: "True"
[Unit] [Unit]
Description=Cactus Comments Description=Cactus Comments
{% for service in matrix_bot_cactus_comments_systemd_required_services_list %} {% for service in matrix_cactus_comments_systemd_required_services_list %}
Requires={{ service }} Requires={{ service }}
After={{ service }} After={{ service }}
{% endfor %} {% endfor %}
{% for service in matrix_bot_cactus_comments_systemd_wanted_services_list %} {% for service in matrix_cactus_comments_systemd_wanted_services_list %}
Wants={{ service }} Wants={{ service }}
{% endfor %} {% endfor %}
DefaultDependencies=no DefaultDependencies=no