diff --git a/roles/dev-locales/tasks/main.yml b/roles/dev-locales/tasks/main.yml index 09c90c56..7de18ceb 100644 --- a/roles/dev-locales/tasks/main.yml +++ b/roles/dev-locales/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Setup locale.gen - template: + template: src: locale.gen.j2 dest: /etc/locale.gen - name: Setup locale.conf - template: + template: src: locale.conf.j2 dest: /etc/locale.conf diff --git a/roles/svc-db-openldap/tasks/main.yml b/roles/svc-db-openldap/tasks/main.yml index 6f331c2f..0ecfa7d1 100644 --- a/roles/svc-db-openldap/tasks/main.yml +++ b/roles/svc-db-openldap/tasks/main.yml @@ -5,7 +5,7 @@ name: docker-compose - name: Create {{ domains | get_domain(application_id) }}.conf if LDAP is exposed to internet - template: + template: src: "nginx.stream.conf.j2" dest: "{{ NGINX.DIRECTORIES.STREAMS }}{{ domains | get_domain(application_id) }}.conf" notify: restart openresty diff --git a/roles/sys-svc-rdbms/tasks/main.yml b/roles/sys-svc-rdbms/tasks/main.yml index 4b3fee67..e346849c 100644 --- a/roles/sys-svc-rdbms/tasks/main.yml +++ b/roles/sys-svc-rdbms/tasks/main.yml @@ -9,7 +9,7 @@ state: directory mode: "0755" - name: "For '{{ application_id }}': Create {{ database_env }}" - template: + template: src: "env/{{ database_type }}.env.j2" dest: "{{ database_env }}" notify: docker compose up diff --git a/roles/sys-svc-webserver/tasks/01_core.yml b/roles/sys-svc-webserver/tasks/01_core.yml index bd86b2b1..f79e100f 100644 --- a/roles/sys-svc-webserver/tasks/01_core.yml +++ b/roles/sys-svc-webserver/tasks/01_core.yml @@ -20,7 +20,7 @@ include_tasks: 04_directories.yml - name: create nginx config file - template: + template: src: nginx.conf.j2 dest: "{{ NGINX.FILES.CONFIGURATION }}" notify: docker compose up diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml index 6c4d934c..5aa47540 100644 --- a/roles/web-app-bigbluebutton/tasks/main.yml +++ b/roles/web-app-bigbluebutton/tasks/main.yml @@ -36,7 +36,7 @@ - name: deploy .env # This seems redundant @todo Checkout if this is true and if so, delete it - template: + template: src: env.j2 dest: "{{ bbb_env_file_origine }}" diff --git a/roles/web-app-discourse/tasks/03_docker.yml b/roles/web-app-discourse/tasks/03_docker.yml index 6aa528cb..68d2cf2d 100644 --- a/roles/web-app-discourse/tasks/03_docker.yml +++ b/roles/web-app-discourse/tasks/03_docker.yml @@ -26,7 +26,7 @@ state: directory - name: "copy configuration to '{{ DISCOURSE_APPLICATION_YML_DEST }}'" - template: + template: src: config.yml.j2 dest: "{{ DISCOURSE_APPLICATION_YML_DEST }}" mode: '0640' diff --git a/roles/web-app-friendica/tasks/01_ldap.yml b/roles/web-app-friendica/tasks/01_ldap.yml index 042aafac..06ffa618 100644 --- a/roles/web-app-friendica/tasks/01_ldap.yml +++ b/roles/web-app-friendica/tasks/01_ldap.yml @@ -1,5 +1,5 @@ - name: "create {{ friendica_host_ldap_config }}" - template: + template: src: "ldapauth.config.php.j2" dest: "{{ friendica_host_ldap_config }}" mode: '644' diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml index 5bf6b3ec..b5649a4f 100644 --- a/roles/web-app-listmonk/tasks/main.yml +++ b/roles/web-app-listmonk/tasks/main.yml @@ -12,7 +12,7 @@ {% endif %} - name: add config.toml - template: + template: src: "config.toml.j2" dest: "{{ LISTMONK_CONFIG_HOST }}" notify: docker compose up diff --git a/roles/web-app-matrix/tasks/01_docker.yml b/roles/web-app-matrix/tasks/01_docker.yml index 7e68077d..b0e8607b 100644 --- a/roles/web-app-matrix/tasks/01_docker.yml +++ b/roles/web-app-matrix/tasks/01_docker.yml @@ -31,26 +31,26 @@ loop: "{{ MATRIX_BRIDGES }}" - name: add multiple mautrix bridge configuration - template: + template: src: "mautrix/{{ item.bridge_name }}.config.yml.j2" dest: "{{ docker_compose.directories.instance }}mautrix/{{ item.bridge_name }}/config.yaml" loop: "{{ MATRIX_BRIDGES }}" notify: docker compose up - name: add element configuration - template: + template: src: "element.config.json.j2" dest: "{{ MATRIX_ELEMENT_CONFIG_PATH_HOST }}" notify: docker compose up - name: add synapse homeserver configuration - template: + template: src: "synapse/homeserver.yaml.j2" dest: "{{ MATRIX_SYNAPSE_CONFIG_PATH_HOST }}" notify: docker compose up - name: add synapse log configuration - template: + template: src: "synapse/log.config.j2" dest: "{{ MATRIX_SYNAPSE_LOG_PATH_HOST }}" notify: docker compose up @@ -61,7 +61,7 @@ cmd: "docker run --rm --mount type=volume,src={{ MATRIX_SYNAPSE_VOLUME }},dst=/data -e SYNAPSE_SERVER_NAME={{ MATRIX_SYNAPSE_DOMAIN }} -e SYNAPSE_REPORT_STATS=no --entrypoint /bin/sh matrixdotorg/synapse:latest -c 'chown -vR 991:991 /data'" - name: add docker-compose.yml - template: + template: src: "docker-compose.yml.j2" dest: "{{ docker_compose.directories.instance }}docker-compose.yml" notify: docker compose up diff --git a/roles/web-app-matrix/tasks/03_webserver.yml b/roles/web-app-matrix/tasks/03_webserver.yml index d6bd42a2..39ca50e1 100644 --- a/roles/web-app-matrix/tasks/03_webserver.yml +++ b/roles/web-app-matrix/tasks/03_webserver.yml @@ -5,7 +5,7 @@ mode: '0755' - name: create {{ MATRIX_WELL_KNOWN_FILE }} - template: + template: src: "well-known.j2" dest: "{{ MATRIX_WELL_KNOWN_FILE }}" @@ -24,7 +24,7 @@ http_port: "{{ MATRIX_SYNAPSE_PORT }}" - name: create {{ MATRIX_SYNAPSE_DOMAIN }}.conf - template: + template: src: "templates/nginx.conf.j2" dest: "{{ NGINX.DIRECTORIES.HTTP.SERVERS }}{{ MATRIX_SYNAPSE_DOMAIN }}.conf" vars: diff --git a/roles/web-app-nextcloud/tasks/01_fullstack.yml b/roles/web-app-nextcloud/tasks/01_fullstack.yml index 956eeef1..9f5cc595 100644 --- a/roles/web-app-nextcloud/tasks/01_fullstack.yml +++ b/roles/web-app-nextcloud/tasks/01_fullstack.yml @@ -3,7 +3,7 @@ name: sys-util-csp-cert - name: create nextcloud proxy configuration file - template: + template: src: "nginx/host.conf.j2" dest: "{{ NEXTCLOUD_HOST_NGINX_PATH }}" notify: restart openresty @@ -31,7 +31,7 @@ notify: docker compose up - name: create internal nextcloud nginx configuration - template: + template: src: "nginx/docker.conf.j2" dest: "{{ [docker_compose.directories.volumes, 'nginx.conf'] | path_join }}" notify: restart nextcloud nginx service diff --git a/roles/web-app-peertube/tasks/_create-domains.yml b/roles/web-app-peertube/tasks/_create-domains.yml index 816b00fc..f90113eb 100644 --- a/roles/web-app-peertube/tasks/_create-domains.yml +++ b/roles/web-app-peertube/tasks/_create-domains.yml @@ -3,7 +3,7 @@ name: sys-util-csp-cert - name: configure {{ domain }}.conf - template: + template: src: "templates/peertube.conf.j2" dest: "{{ [ NGINX.DIRECTORIES.HTTP.SERVERS, domain ~ '.conf'] | path_join }}" notify: restart openresty diff --git a/roles/web-app-syncope/tasks/main.yml b/roles/web-app-syncope/tasks/main.yml index 0b42de39..ee769e47 100644 --- a/roles/web-app-syncope/tasks/main.yml +++ b/roles/web-app-syncope/tasks/main.yml @@ -4,13 +4,13 @@ name: sys-stk-back-stateful - name: configure {{ domain }}.conf - template: + template: src: "templates/proxy.conf.j2" dest: "{{ [ NGINX.DIRECTORIES.HTTP.SERVERS, domain ~ '.conf'] | path_join }}" notify: restart openresty - name: "create {{ docker_compose.files.env }}" - template: + template: src: "database.j2" dest: "{{ docker_compose.files.env }}" mode: "0770" diff --git a/roles/web-svc-legal/tasks/main.yml b/roles/web-svc-legal/tasks/main.yml index 34580d75..769ba2db 100644 --- a/roles/web-svc-legal/tasks/main.yml +++ b/roles/web-svc-legal/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: copy imprint.html - template: + template: src: "imprint.html.j2" dest: "{{NGINX.DIRECTORIES.DATA.HTML}}imprint.html" owner: "{{ NGINX.USER }}"