diff --git a/roles/svc-db-openldap/tasks/main.yml b/roles/svc-db-openldap/tasks/main.yml index 34190169..6f331c2f 100644 --- a/roles/svc-db-openldap/tasks/main.yml +++ b/roles/svc-db-openldap/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "include docker-compose role" - include_role: + include_role: name: docker-compose - name: Create {{ domains | get_domain(application_id) }}.conf if LDAP is exposed to internet diff --git a/roles/svc-prx-openresty/tasks/main.yml b/roles/svc-prx-openresty/tasks/main.yml index 18a5a7f9..7d1c1332 100644 --- a/roles/svc-prx-openresty/tasks/main.yml +++ b/roles/svc-prx-openresty/tasks/main.yml @@ -1,6 +1,6 @@ - block: - name: "For '{{ application_id }}': Load docker-compose" - include_role: + include_role: name: docker-compose vars: docker_compose_flush_handlers: true diff --git a/roles/sys-stk-back-stateless/tasks/main.yml b/roles/sys-stk-back-stateless/tasks/main.yml index abee8fa8..aa54913b 100644 --- a/roles/sys-stk-back-stateless/tasks/main.yml +++ b/roles/sys-stk-back-stateless/tasks/main.yml @@ -1,7 +1,7 @@ # run_once_sys_stk_back_stateless: disabled - name: "For '{{ application_id }}': Load docker-compose" - include_role: + include_role: name: docker-compose vars: docker_compose_flush_handlers: false diff --git a/roles/sys-stk-full-stateless/tasks/main.yml b/roles/sys-stk-full-stateless/tasks/main.yml index 0cb99917..7edb8ece 100644 --- a/roles/sys-stk-full-stateless/tasks/main.yml +++ b/roles/sys-stk-full-stateless/tasks/main.yml @@ -9,5 +9,5 @@ http_port: "{{ ports.localhost.http[application_id] }}" - name: "For '{{ application_id }}': Load sys-stk-back-stateless" - include_role: + include_role: name: sys-stk-back-stateless diff --git a/roles/sys-util-csp-cert/tasks/main.yml b/roles/sys-util-csp-cert/tasks/main.yml index bfcc10ac..e684df9f 100644 --- a/roles/sys-util-csp-cert/tasks/main.yml +++ b/roles/sys-util-csp-cert/tasks/main.yml @@ -1,9 +1,9 @@ # run_once_sys_util_csp_cert: deactivated - name: "include role sys-front-inj-all for '{{ domain }}'" - include_role: + include_role: name: sys-front-inj-all - name: "include role sys-svc-certs for '{{ domain }}'" - include_role: + include_role: name: sys-svc-certs diff --git a/roles/web-app-baserow/tasks/main.yml b/roles/web-app-baserow/tasks/main.yml index 3dc4a43f..17ad4262 100644 --- a/roles/web-app-baserow/tasks/main.yml +++ b/roles/web-app-baserow/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "For '{{ application_id }}': load docker, db and proxy" - include_role: + include_role: name: sys-stk-full-stateful \ No newline at end of file diff --git a/roles/web-app-bluesky/tasks/main.yml b/roles/web-app-bluesky/tasks/main.yml index 7199770c..d088f2fb 100644 --- a/roles/web-app-bluesky/tasks/main.yml +++ b/roles/web-app-bluesky/tasks/main.yml @@ -1,5 +1,5 @@ - name: "include docker-compose role" - include_role: + include_role: name: docker-compose vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-confluence/tasks/main.yml b/roles/web-app-confluence/tasks/main.yml index cf3c4d3e..c581ae28 100644 --- a/roles/web-app-confluence/tasks/main.yml +++ b/roles/web-app-confluence/tasks/main.yml @@ -1,7 +1,7 @@ --- - block: - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - include_tasks: utils/run_once.yml when: run_once_web_app_confluence is not defined diff --git a/roles/web-app-discourse/tasks/03_docker.yml b/roles/web-app-discourse/tasks/03_docker.yml index 14faf68e..6aa528cb 100644 --- a/roles/web-app-discourse/tasks/03_docker.yml +++ b/roles/web-app-discourse/tasks/03_docker.yml @@ -5,7 +5,7 @@ state: present - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-espocrm/tasks/main.yml b/roles/web-app-espocrm/tasks/main.yml index 8f1ae73d..3ee51cac 100644 --- a/roles/web-app-espocrm/tasks/main.yml +++ b/roles/web-app-espocrm/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-friendica/tasks/main.yml b/roles/web-app-friendica/tasks/main.yml index 216f002e..84f624e2 100644 --- a/roles/web-app-friendica/tasks/main.yml +++ b/roles/web-app-friendica/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: Integrate LDAP diff --git a/roles/web-app-funkwhale/tasks/main.yml b/roles/web-app-funkwhale/tasks/main.yml index 8b84efd0..6788c3a0 100644 --- a/roles/web-app-funkwhale/tasks/main.yml +++ b/roles/web-app-funkwhale/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-app-fusiondirectory/tasks/main.yml b/roles/web-app-fusiondirectory/tasks/main.yml index 9e32bc73..c79c2f0f 100644 --- a/roles/web-app-fusiondirectory/tasks/main.yml +++ b/roles/web-app-fusiondirectory/tasks/main.yml @@ -1,3 +1,3 @@ - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-app-gitea/tasks/main.yml b/roles/web-app-gitea/tasks/main.yml index a2bd7375..41fc3d36 100644 --- a/roles/web-app-gitea/tasks/main.yml +++ b/roles/web-app-gitea/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: Wait for Gitea HTTP endpoint diff --git a/roles/web-app-gitlab/tasks/main.yml b/roles/web-app-gitlab/tasks/main.yml index 07006289..0448185f 100644 --- a/roles/web-app-gitlab/tasks/main.yml +++ b/roles/web-app-gitlab/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-app-jenkins/tasks/main.yml b/roles/web-app-jenkins/tasks/main.yml index 47deddd1..5530461f 100644 --- a/roles/web-app-jenkins/tasks/main.yml +++ b/roles/web-app-jenkins/tasks/main.yml @@ -1,4 +1,4 @@ - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-app-joomla/tasks/main.yml b/roles/web-app-joomla/tasks/main.yml index 005d9ea2..8429c200 100644 --- a/roles/web-app-joomla/tasks/main.yml +++ b/roles/web-app-joomla/tasks/main.yml @@ -9,7 +9,7 @@ http_port: "{{ ports.localhost.http[application_id] }}" - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml index 5bbb7baa..5bf6b3ec 100644 --- a/roles/web-app-listmonk/tasks/main.yml +++ b/roles/web-app-listmonk/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false @@ -14,7 +14,7 @@ - name: add config.toml template: src: "config.toml.j2" - dest: "{{ docker_compose.directories.config }}config.toml" + dest: "{{ LISTMONK_CONFIG_HOST }}" notify: docker compose up - meta: flush_handlers diff --git a/roles/web-app-listmonk/templates/docker-compose.yml.j2 b/roles/web-app-listmonk/templates/docker-compose.yml.j2 index 313351b1..535a935b 100644 --- a/roles/web-app-listmonk/templates/docker-compose.yml.j2 +++ b/roles/web-app-listmonk/templates/docker-compose.yml.j2 @@ -7,7 +7,7 @@ ports: - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}" 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/depends_on/dmbs_excl.yml.j2' %} {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %} diff --git a/roles/web-app-listmonk/vars/main.yml b/roles/web-app-listmonk/vars/main.yml index 1fa04133..53dbb120 100644 --- a/roles/web-app-listmonk/vars/main.yml +++ b/roles/web-app-listmonk/vars/main.yml @@ -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_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}" 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') }}" diff --git a/roles/web-app-mailu/tasks/01_core.yml b/roles/web-app-mailu/tasks/01_core.yml index 5e707514..c664dc37 100644 --- a/roles/web-app-mailu/tasks/01_core.yml +++ b/roles/web-app-mailu/tasks/01_core.yml @@ -26,7 +26,7 @@ - name: "Mailu Docker and Webserver Setup" block: - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml index a79bb6b9..8021f248 100644 --- a/roles/web-app-mastodon/tasks/main.yml +++ b/roles/web-app-mastodon/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include setup for domain '{{ domain }}'" - include_role: + include_role: name: sys-stk-front-proxy loop: "{{ domains['web-app-mastodon'] }}" loop_control: @@ -13,7 +13,7 @@ vhost_flavour: "ws_generic" - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-matomo/tasks/01_core.yml b/roles/web-app-matomo/tasks/01_core.yml index eb097258..b5c561e9 100644 --- a/roles/web-app-matomo/tasks/01_core.yml +++ b/roles/web-app-matomo/tasks/01_core.yml @@ -1,5 +1,5 @@ - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: "Patch Matomo config.ini.php" diff --git a/roles/web-app-matrix/tasks/01_docker.yml b/roles/web-app-matrix/tasks/01_docker.yml index b3e69f74..7e68077d 100644 --- a/roles/web-app-matrix/tasks/01_docker.yml +++ b/roles/web-app-matrix/tasks/01_docker.yml @@ -1,5 +1,5 @@ - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-matrix/tasks/03_webserver.yml b/roles/web-app-matrix/tasks/03_webserver.yml index 07230f30..d6bd42a2 100644 --- a/roles/web-app-matrix/tasks/03_webserver.yml +++ b/roles/web-app-matrix/tasks/03_webserver.yml @@ -10,7 +10,7 @@ dest: "{{ MATRIX_WELL_KNOWN_FILE }}" - name: "include role sys-stk-front-proxy for {{ MATRIX_ELEMENT_DOMAIN }}" - include_role: + include_role: name: sys-stk-front-proxy vars: domain: "{{ MATRIX_ELEMENT_DOMAIN }}" diff --git a/roles/web-app-matrix/vars/main.yml b/roles/web-app-matrix/vars/main.yml index a3613528..5cbe7b33 100644 --- a/roles/web-app-matrix/vars/main.yml +++ b/roles/web-app-matrix/vars/main.yml @@ -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_DOMAIN: "{{ domains[application_id].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_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_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_DOMAIN: "{{ domains[application_id].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 }}" diff --git a/roles/web-app-mediawiki/tasks/main.yml b/roles/web-app-mediawiki/tasks/main.yml index a88c18bc..ca4bedf5 100644 --- a/roles/web-app-mediawiki/tasks/main.yml +++ b/roles/web-app-mediawiki/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for '{{ application_id }}'" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-mobilizon/tasks/main.yml b/roles/web-app-mobilizon/tasks/main.yml index c5704255..4d396871 100644 --- a/roles/web-app-mobilizon/tasks/main.yml +++ b/roles/web-app-mobilizon/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: add config.exs diff --git a/roles/web-app-mobilizon/vars/main.yml b/roles/web-app-mobilizon/vars/main.yml index 759bfc9e..2b64d313 100644 --- a/roles/web-app-mobilizon/vars/main.yml +++ b/roles/web-app-mobilizon/vars/main.yml @@ -10,7 +10,7 @@ postgres_gis_enabled: true docker_compose_flush_handlers: false # Mobilizon -mobilizon_host_conf_exs_file: "{{ docker_compose.directories.config }}config.exs" -mobilizon_version: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.version', True) }}" -mobilizon_image: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.image', True) }}" -mobilizon_container: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name', True) }}" \ No newline at end of file +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') }}" +mobilizon_image: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.image') }}" +mobilizon_container: "{{ applications | get_app_conf(application_id, 'docker.services.mobilizon.name') }}" \ No newline at end of file diff --git a/roles/web-app-moodle/tasks/main.yml b/roles/web-app-moodle/tasks/main.yml index 5562e0e4..cf0e3144 100644 --- a/roles/web-app-moodle/tasks/main.yml +++ b/roles/web-app-moodle/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: Check if config.php exists diff --git a/roles/web-app-nextcloud/tasks/01_fullstack.yml b/roles/web-app-nextcloud/tasks/01_fullstack.yml index 3f6d7128..956eeef1 100644 --- a/roles/web-app-nextcloud/tasks/01_fullstack.yml +++ b/roles/web-app-nextcloud/tasks/01_fullstack.yml @@ -9,7 +9,7 @@ notify: restart openresty - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-nextcloud/tasks/main.yml b/roles/web-app-nextcloud/tasks/main.yml index f1f61657..319c373c 100644 --- a/roles/web-app-nextcloud/tasks/main.yml +++ b/roles/web-app-nextcloud/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: diff --git a/roles/web-app-openproject/tasks/main.yml b/roles/web-app-openproject/tasks/main.yml index ec11d171..42a219c4 100644 --- a/roles/web-app-openproject/tasks/main.yml +++ b/roles/web-app-openproject/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: "Create {{ openproject_plugins_folder }}" diff --git a/roles/web-app-peertube/tasks/main.yml b/roles/web-app-peertube/tasks/main.yml index 2d41f112..fd358dd2 100644 --- a/roles/web-app-peertube/tasks/main.yml +++ b/roles/web-app-peertube/tasks/main.yml @@ -10,7 +10,7 @@ ws_port: "{{ ports.localhost.http[application_id] }}" - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful - name: "Install and activate auth-openid-connect plugin if OIDC is enabled" diff --git a/roles/web-app-pixelfed/tasks/main.yml b/roles/web-app-pixelfed/tasks/main.yml index 07006289..0448185f 100644 --- a/roles/web-app-pixelfed/tasks/main.yml +++ b/roles/web-app-pixelfed/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-app-pretix/tasks/main.yml b/roles/web-app-pretix/tasks/main.yml index 805c4773..33992ce6 100644 --- a/roles/web-app-pretix/tasks/main.yml +++ b/roles/web-app-pretix/tasks/main.yml @@ -1,7 +1,7 @@ --- - block: - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - include_tasks: utils/run_once.yml when: run_once_web_app_pretix is not defined diff --git a/roles/web-app-roulette-wheel/tasks/main.yml b/roles/web-app-roulette-wheel/tasks/main.yml index 8b1a52e2..cfb1d185 100644 --- a/roles/web-app-roulette-wheel/tasks/main.yml +++ b/roles/web-app-roulette-wheel/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "include docker-compose role" - include_role: + include_role: name: docker-compose - name: pull app repository diff --git a/roles/web-app-snipe-it/tasks/main.yml b/roles/web-app-snipe-it/tasks/main.yml index 1774723c..f446591d 100644 --- a/roles/web-app-snipe-it/tasks/main.yml +++ b/roles/web-app-snipe-it/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful - name: "Configure Snipe-IT LDAP settings" diff --git a/roles/web-app-syncope/tasks/main.yml b/roles/web-app-syncope/tasks/main.yml index 8c731ff4..0b42de39 100644 --- a/roles/web-app-syncope/tasks/main.yml +++ b/roles/web-app-syncope/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful - name: configure {{ domain }}.conf diff --git a/roles/web-app-taiga/tasks/main.yml b/roles/web-app-taiga/tasks/main.yml index 19cd9747..5d981223 100644 --- a/roles/web-app-taiga/tasks/main.yml +++ b/roles/web-app-taiga/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-wordpress/tasks/main.yml b/roles/web-app-wordpress/tasks/main.yml index 4a89dbaf..0037f45a 100644 --- a/roles/web-app-wordpress/tasks/main.yml +++ b/roles/web-app-wordpress/tasks/main.yml @@ -10,7 +10,7 @@ http_port: "{{ ports.localhost.http[application_id] }}" - name: "load docker and db for {{ application_id }}" - include_role: + include_role: name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-xwiki/tasks/01_core.yml b/roles/web-app-xwiki/tasks/01_core.yml index 3bbee130..afe2c555 100644 --- a/roles/web-app-xwiki/tasks/01_core.yml +++ b/roles/web-app-xwiki/tasks/01_core.yml @@ -3,7 +3,7 @@ - block: - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-yourls/tasks/main.yml b/roles/web-app-yourls/tasks/main.yml index 2f8a5044..55e30efd 100644 --- a/roles/web-app-yourls/tasks/main.yml +++ b/roles/web-app-yourls/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-opt-rdr-domains/tasks/redirect-domain.yml b/roles/web-opt-rdr-domains/tasks/redirect-domain.yml index 5bccd8b4..ae3fd506 100644 --- a/roles/web-opt-rdr-domains/tasks/redirect-domain.yml +++ b/roles/web-opt-rdr-domains/tasks/redirect-domain.yml @@ -1,5 +1,5 @@ - name: "include task receive certbot certificate" - include_role: + include_role: name: sys-svc-certs - name: "Deploying NGINX redirect configuration for '{{ domain }}'" diff --git a/roles/web-svc-coturn/tasks/main.yml b/roles/web-svc-coturn/tasks/main.yml index 07006289..0448185f 100644 --- a/roles/web-svc-coturn/tasks/main.yml +++ b/roles/web-svc-coturn/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful diff --git a/roles/web-svc-libretranslate/tasks/main.yml b/roles/web-svc-libretranslate/tasks/main.yml index 04676c3c..3459fa24 100644 --- a/roles/web-svc-libretranslate/tasks/main.yml +++ b/roles/web-svc-libretranslate/tasks/main.yml @@ -1,5 +1,5 @@ - name: "load docker, db and proxy for {{ application_id }}" - include_role: + include_role: name: sys-stk-full-stateful when: run_once_web_app_libretranslate is not defined diff --git a/roles/web-svc-simpleicons/vars/main.yml b/roles/web-svc-simpleicons/vars/main.yml index 08f01e85..4c6d7914 100644 --- a/roles/web-svc-simpleicons/vars/main.yml +++ b/roles/web-svc-simpleicons/vars/main.yml @@ -1,4 +1,4 @@ application_id: web-svc-simpleicons container_port: 3000 -simpleicons_host_server_file: "{{ docker_compose.directories.config }}server.js" -simpleicons_host_package_file: "{{ docker_compose.directories.config }}package.json" \ No newline at end of file +simpleicons_host_server_file: "{{ [ docker_compose.directories.config, 'server.js' ] | path_join }}" +simpleicons_host_package_file: "{{ [ docker_compose.directories.config, 'package.json' ] | path_join }}" \ No newline at end of file diff --git a/templates/roles/web-app/tasks/main.yml.j2 b/templates/roles/web-app/tasks/main.yml.j2 index 5c9aa170..e6fc851a 100644 --- a/templates/roles/web-app/tasks/main.yml.j2 +++ b/templates/roles/web-app/tasks/main.yml.j2 @@ -3,14 +3,14 @@ {% raw %} # Default: Loading; Docker, Database and Reverse Proxy - name: "load docker, db and proxy for '{{ application_id }}'" - include_role: + include_role: name: sys-stk-full-stateful when: run_once_docker_{% endraw %}{{ application_id | replace("_", "-") }}{% raw %} is not defined {% endraw %} {% else %} {% raw %} - name: "load docker, proxy for '{{ application_id }}'" - include_role: + include_role: name: sys-stk-full-stateful when: run_once_docker_{% endraw %}{{ application_id | replace("_", "-") }}{% raw %} is not defined {% endraw %}