mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-09-24 11:06:24 +02:00
refactor(ansible): normalize include_role syntax and unify host config paths via path_join
- Remove stray spaces after include_role: across many roles to ensure clean YAML and consistent linting/formatting. - Listmonk: - Introduce LISTMONK_CONFIG_HOST = [ docker_compose.directories.config, 'config.toml' ] | path_join - Use that var in the template task (dest) and the docker-compose volume mount - Matrix: - Build MATRIX_SYNAPSE_CONFIG_PATH_HOST, MATRIX_SYNAPSE_LOG_PATH_HOST, and MATRIX_ELEMENT_CONFIG_PATH_HOST via path_join - Mobilizon: - Build mobilizon_host_conf_exs_file via path_join - Keep get_app_conf strictness unchanged (defaults to True in our filter), so behavior remains strict even though the explicit third arg was dropped - Simpleicons: - Build server.js and package.json host paths via path_join - Numerous web-app roles (Confluence, Discourse, EspoCRM, Friendica, Funkwhale, Gitea, GitLab, Jenkins, Joomla, Listmonk, Mailu, Mastodon, Matomo, Matrix, MediaWiki, Mobilizon, Moodle, Nextcloud, OpenProject, Peertube, Pixelfed, Pretix, Roulette Wheel, Snipe-IT, Syncope, Taiga, WordPress, XWiki, Yourls) and web-svc roles (coturn, libretranslate, simpleicons) updated for consistent include_role formatting Why: - path_join avoids double slashes and missing separators across different config roots - Consistent include_role: formatting improves readability and prevents linter noise Ref: - Conversation: https://chatgpt.com/share/68d14711-727c-800f-b454-7dc4c3c1f4cb
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
- name: add config.toml
|
- name: add config.toml
|
||||||
template:
|
template:
|
||||||
src: "config.toml.j2"
|
src: "config.toml.j2"
|
||||||
dest: "{{ docker_compose.directories.config }}config.toml"
|
dest: "{{ LISTMONK_CONFIG_HOST }}"
|
||||||
notify: docker compose up
|
notify: docker compose up
|
||||||
|
|
||||||
- meta: flush_handlers
|
- meta: flush_handlers
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
|
- "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
|
||||||
volumes:
|
volumes:
|
||||||
- {{ docker_compose.directories.config }}config.toml:/listmonk/config.toml
|
- {{ LISTMONK_CONFIG_HOST }}:/listmonk/config.toml
|
||||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
||||||
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
|
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
|
||||||
{% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
|
{% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
|
||||||
|
@@ -7,6 +7,7 @@ container_port: "{{ applications | get_app_conf(application_id, 'd
|
|||||||
LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
|
LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
|
||||||
LISTMONK_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
|
LISTMONK_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
|
||||||
LISTMONK_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
|
LISTMONK_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
|
||||||
|
LISTMONK_CONFIG_HOST: "{{ [ docker_compose.directories.config,'config.toml' ] | path_join }}"
|
||||||
|
|
||||||
LISTMONK_PUBLIC_API_ENABLED: "{{ applications | get_app_conf(application_id, 'public_api_activated') }}"
|
LISTMONK_PUBLIC_API_ENABLED: "{{ applications | get_app_conf(application_id, 'public_api_activated') }}"
|
||||||
|
|
||||||
|
@@ -28,9 +28,9 @@ MATRIX_SYNAPSE_NAME: "{{ applications | get_app_conf(applicatio
|
|||||||
MATRIX_SYNAPSE_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.synapse') }}"
|
MATRIX_SYNAPSE_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.synapse') }}"
|
||||||
MATRIX_SYNAPSE_DOMAIN: "{{ domains[application_id].synapse }}"
|
MATRIX_SYNAPSE_DOMAIN: "{{ domains[application_id].synapse }}"
|
||||||
MATRIX_SYNAPSE_PORT: "{{ ports.localhost.http['web-app-matrix_synapse'] }}"
|
MATRIX_SYNAPSE_PORT: "{{ ports.localhost.http['web-app-matrix_synapse'] }}"
|
||||||
MATRIX_SYNAPSE_CONFIG_PATH_HOST: "{{ docker_compose.directories.config }}homeserver.yaml"
|
MATRIX_SYNAPSE_CONFIG_PATH_HOST: "{{ [ docker_compose.directories.config, 'homeserver.yaml' ] | path_join }}"
|
||||||
MATRIX_SYNAPSE_CONFIG_PATH_CONTAINER: "/data/homeserver.yaml"
|
MATRIX_SYNAPSE_CONFIG_PATH_CONTAINER: "/data/homeserver.yaml"
|
||||||
MATRIX_SYNAPSE_LOG_PATH_HOST: "{{ docker_compose.directories.config }}{{ MATRIX_SYNAPSE_DOMAIN }}.log.config"
|
MATRIX_SYNAPSE_LOG_PATH_HOST: "{{ [ docker_compose.directories.config, MATRIX_SYNAPSE_DOMAIN ~'.log.config' ] | path_join }}"
|
||||||
MATRIX_SYNAPSE_LOG_PATH_CONTAINER: "/data/{{ MATRIX_SYNAPSE_DOMAIN }}.log.config"
|
MATRIX_SYNAPSE_LOG_PATH_CONTAINER: "/data/{{ MATRIX_SYNAPSE_DOMAIN }}.log.config"
|
||||||
MATRIX_SYNAPSE_URL: "{{ WEB_PROTOCOL }}://{{ MATRIX_SYNAPSE_DOMAIN }}"
|
MATRIX_SYNAPSE_URL: "{{ WEB_PROTOCOL }}://{{ MATRIX_SYNAPSE_DOMAIN }}"
|
||||||
|
|
||||||
@@ -40,4 +40,4 @@ MATRIX_ELEMENT_IMAGE: "{{ applications | get_app_conf(applicatio
|
|||||||
MATRIX_ELEMENT_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.element.name') }}"
|
MATRIX_ELEMENT_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.element.name') }}"
|
||||||
MATRIX_ELEMENT_DOMAIN: "{{ domains[application_id].element }}"
|
MATRIX_ELEMENT_DOMAIN: "{{ domains[application_id].element }}"
|
||||||
MATRIX_ELEMENT_PORT: "{{ ports.localhost.http['web-app-matrix_element'] }}"
|
MATRIX_ELEMENT_PORT: "{{ ports.localhost.http['web-app-matrix_element'] }}"
|
||||||
MATRIX_ELEMENT_CONFIG_PATH_HOST: "{{ docker_compose.directories.config }}element-config.json"
|
MATRIX_ELEMENT_CONFIG_PATH_HOST: "{{ [ docker_compose.directories.config, 'element-config.json' ] | path_join }}"
|
||||||
|
@@ -10,7 +10,7 @@ postgres_gis_enabled: true
|
|||||||
docker_compose_flush_handlers: false
|
docker_compose_flush_handlers: false
|
||||||
|
|
||||||
# Mobilizon
|
# Mobilizon
|
||||||
mobilizon_host_conf_exs_file: "{{ docker_compose.directories.config }}config.exs"
|
mobilizon_host_conf_exs_file: "{{ [ docker_compose.directories.config, 'config.exs' ] | path_join }}"
|
||||||
mobilizon_version: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.version', True) }}"
|
mobilizon_version: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.version') }}"
|
||||||
mobilizon_image: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.image', True) }}"
|
mobilizon_image: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.image') }}"
|
||||||
mobilizon_container: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name', True) }}"
|
mobilizon_container: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name') }}"
|
@@ -1,4 +1,4 @@
|
|||||||
application_id: web-svc-simpleicons
|
application_id: web-svc-simpleicons
|
||||||
container_port: 3000
|
container_port: 3000
|
||||||
simpleicons_host_server_file: "{{ docker_compose.directories.config }}server.js"
|
simpleicons_host_server_file: "{{ [ docker_compose.directories.config, 'server.js' ] | path_join }}"
|
||||||
simpleicons_host_package_file: "{{ docker_compose.directories.config }}package.json"
|
simpleicons_host_package_file: "{{ [ docker_compose.directories.config, 'package.json' ] | path_join }}"
|
Reference in New Issue
Block a user