From 40a30cc92716615428de9a72c0c417a602477960 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 21 Feb 2025 05:46:42 +0100 Subject: [PATCH] Removed set_fact https_port --- roles/docker-akaunting/tasks/main.yml | 5 ++++- roles/docker-baserow/tasks/main.yml | 5 ++++- roles/docker-bigbluebutton/tasks/main.yml | 5 ++++- roles/docker-compose/tasks/main.yml | 5 ----- roles/docker-discourse/tasks/main.yml | 5 ++++- roles/docker-elk/tasks/main.yml | 5 ++++- roles/docker-friendica/tasks/main.yml | 5 ++++- roles/docker-funkwhale/tasks/main.yml | 5 ++++- roles/docker-gitea/tasks/main.yml | 5 ++++- roles/docker-gitlab/tasks/main.yml | 5 ++++- roles/docker-jenkins/tasks/main.yml | 5 ++++- roles/docker-joomla/tasks/main.yml | 5 ++++- roles/docker-keycloak/tasks/main.yml | 5 ++++- roles/docker-ldap/tasks/main.yml | 5 ++++- roles/docker-listmonk/tasks/main.yml | 5 ++++- roles/docker-mailu/tasks/main.yml | 5 ++++- roles/docker-mastodon/templates/mastodon.conf.j2 | 2 +- roles/docker-matomo/tasks/main.yml | 5 ++++- roles/docker-matrix-compose/templates/nginx.conf.j2 | 5 +++-- roles/docker-mediawiki/tasks/main.yml | 5 ++++- roles/docker-moodle/tasks/main.yml | 5 ++++- roles/docker-openproject/tasks/main.yml | 5 ++++- roles/docker-phpmyadmin/tasks/main.yml | 5 ++++- roles/docker-pixelfed/tasks/main.yml | 5 ++++- roles/docker-portfolio/tasks/main.yml | 5 ++++- roles/docker-snipe_it/tasks/main.yml | 5 ++++- roles/docker-taiga/tasks/main.yml | 5 ++++- roles/docker-wordpress/tasks/main.yml | 3 ++- roles/docker-yourls/tasks/main.yml | 5 ++++- 29 files changed, 106 insertions(+), 34 deletions(-) diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/docker-akaunting/tasks/main.yml index 0fc7fe6b..120ca34d 100644 --- a/roles/docker-akaunting/tasks/main.yml +++ b/roles/docker-akaunting/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include tasks update-repository-with-files.yml" include_tasks: update-repository-with-files.yml diff --git a/roles/docker-baserow/tasks/main.yml b/roles/docker-baserow/tasks/main.yml index 9ecd9303..4c0c4419 100644 --- a/roles/docker-baserow/tasks/main.yml +++ b/roles/docker-baserow/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/docker-bigbluebutton/tasks/main.yml index a8d53516..5c5ee48e 100644 --- a/roles/docker-bigbluebutton/tasks/main.yml +++ b/roles/docker-bigbluebutton/tasks/main.yml @@ -16,8 +16,11 @@ # notify: restart nginx - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: configure websocket_upgrade.conf copy: diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml index ace3a86a..d002ab6f 100644 --- a/roles/docker-compose/tasks/main.yml +++ b/roles/docker-compose/tasks/main.yml @@ -9,11 +9,6 @@ - domains[application_id] is string # Default case: One domain exists. Some applications like matrix don't have an default domain -- name: "Set global http_port to {{ ports.localhost.http[application_id] }}" - set_fact: - http_port: "{{ ports.localhost.http[application_id] if application_id in ports.localhost.http else None }}" - # Default case: One port exists. Some applications like matrix don't have an default port - - name: "remove {{ docker_compose.directories.instance }} and all its contents" file: path: "{{ docker_compose.directories.instance }}" diff --git a/roles/docker-discourse/tasks/main.yml b/roles/docker-discourse/tasks/main.yml index bc9d3733..5edfca1c 100644 --- a/roles/docker-discourse/tasks/main.yml +++ b/roles/docker-discourse/tasks/main.yml @@ -11,8 +11,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "cleanup central database from {{application_id}}_default network" command: diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index b928208a..cf46b0bf 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -1,8 +1,11 @@ --- - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: create elasticsearch-sysctl.conf copy: diff --git a/roles/docker-friendica/tasks/main.yml b/roles/docker-friendica/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-friendica/tasks/main.yml +++ b/roles/docker-friendica/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-funkwhale/tasks/main.yml b/roles/docker-funkwhale/tasks/main.yml index baa2e206..8cdf7b2c 100644 --- a/roles/docker-funkwhale/tasks/main.yml +++ b/roles/docker-funkwhale/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-gitlab/tasks/main.yml b/roles/docker-gitlab/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-gitlab/tasks/main.yml +++ b/roles/docker-gitlab/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml index 66f659a8..3cb76c33 100644 --- a/roles/docker-jenkins/tasks/main.yml +++ b/roles/docker-jenkins/tasks/main.yml @@ -1,6 +1,9 @@ - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "docker jenkins" docker_compose: diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index 5ffd5bfc..03016af5 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" loop: "{{ domains }}" loop_control: loop_var: domain diff --git a/roles/docker-keycloak/tasks/main.yml b/roles/docker-keycloak/tasks/main.yml index 45a73209..30ab57c8 100644 --- a/roles/docker-keycloak/tasks/main.yml +++ b/roles/docker-keycloak/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-ldap/tasks/main.yml b/roles/docker-ldap/tasks/main.yml index 33810d02..cd8c39ba 100644 --- a/roles/docker-ldap/tasks/main.yml +++ b/roles/docker-ldap/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-compose - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: Create {{domain}}.conf if LDAP is exposed to internet template: diff --git a/roles/docker-listmonk/tasks/main.yml b/roles/docker-listmonk/tasks/main.yml index e9a942b4..38d62797 100644 --- a/roles/docker-listmonk/tasks/main.yml +++ b/roles/docker-listmonk/tasks/main.yml @@ -13,8 +13,11 @@ {% endif %} - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index 36c6a14e..a455f8d2 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" vars: nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 31M;" diff --git a/roles/docker-mastodon/templates/mastodon.conf.j2 b/roles/docker-mastodon/templates/mastodon.conf.j2 index 4bf18304..48ac5570 100644 --- a/roles/docker-mastodon/templates/mastodon.conf.j2 +++ b/roles/docker-mastodon/templates/mastodon.conf.j2 @@ -4,7 +4,7 @@ map $http_upgrade $connection_upgrade { } server { - server_name {{domain}}; + server_name {{domains[application_id]}}; {% include 'roles/letsencrypt/templates/ssl_header.j2' %} diff --git a/roles/docker-matomo/tasks/main.yml b/roles/docker-matomo/tasks/main.yml index 0adb05da..de2df511 100644 --- a/roles/docker-matomo/tasks/main.yml +++ b/roles/docker-matomo/tasks/main.yml @@ -5,8 +5,11 @@ when: run_once_docker_matomo is not defined - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" when: run_once_docker_matomo is not defined - name: "copy docker-compose.yml and env file" diff --git a/roles/docker-matrix-compose/templates/nginx.conf.j2 b/roles/docker-matrix-compose/templates/nginx.conf.j2 index 9a58de18..bb8a8539 100644 --- a/roles/docker-matrix-compose/templates/nginx.conf.j2 +++ b/roles/docker-matrix-compose/templates/nginx.conf.j2 @@ -1,9 +1,10 @@ server { - # Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary + {# Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary #} + {# Could be that this is related to the set_fact use #} {% set domain = domains.matrix_synapse %} {% set http_port = ports.localhost.http.matrix_synapse %} - server_name {{domain}}; + server_name {{domains.matrix_synapse}}; {% include 'roles/letsencrypt/templates/ssl_header.j2' %} # For the federation port diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml index 541c487d..62aa92ab 100644 --- a/roles/docker-mediawiki/tasks/main.yml +++ b/roles/docker-mediawiki/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose.directories.instance}}docker-compose.yml diff --git a/roles/docker-moodle/tasks/main.yml b/roles/docker-moodle/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-moodle/tasks/main.yml +++ b/roles/docker-moodle/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-openproject/tasks/main.yml b/roles/docker-openproject/tasks/main.yml index d63f1bd8..26728866 100644 --- a/roles/docker-openproject/tasks/main.yml +++ b/roles/docker-openproject/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "Create {{openproject_plugins_service}}" file: diff --git a/roles/docker-phpmyadmin/tasks/main.yml b/roles/docker-phpmyadmin/tasks/main.yml index a2bd50ba..9aba687b 100644 --- a/roles/docker-phpmyadmin/tasks/main.yml +++ b/roles/docker-phpmyadmin/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-compose - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-pixelfed/tasks/main.yml b/roles/docker-pixelfed/tasks/main.yml index 9ecd9303..4c0c4419 100644 --- a/roles/docker-pixelfed/tasks/main.yml +++ b/roles/docker-pixelfed/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml \ No newline at end of file diff --git a/roles/docker-portfolio/tasks/main.yml b/roles/docker-portfolio/tasks/main.yml index be2a8461..90229482 100644 --- a/roles/docker-portfolio/tasks/main.yml +++ b/roles/docker-portfolio/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-compose - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include role docker-repository-setup for {{application_id}}" include_role: diff --git a/roles/docker-snipe_it/tasks/main.yml b/roles/docker-snipe_it/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-snipe_it/tasks/main.yml +++ b/roles/docker-snipe_it/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml diff --git a/roles/docker-taiga/tasks/main.yml b/roles/docker-taiga/tasks/main.yml index 846c8787..47b6ebbf 100644 --- a/roles/docker-taiga/tasks/main.yml +++ b/roles/docker-taiga/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "include role docker-repository-setup for {{application_id}}" include_role: diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/docker-wordpress/tasks/main.yml index fe2fca95..0cd7bd7c 100644 --- a/roles/docker-wordpress/tasks/main.yml +++ b/roles/docker-wordpress/tasks/main.yml @@ -4,13 +4,14 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup loop: "{{ domains.wordpress }}" loop_control: loop_var: domain vars: nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size {{wordpress_max_upload_size}};" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "Transfering upload.ini to {{docker_compose.directories.instance}}" template: diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml index 76ee6b3f..58d85582 100644 --- a/roles/docker-yourls/tasks/main.yml +++ b/roles/docker-yourls/tasks/main.yml @@ -4,8 +4,11 @@ name: docker-central-database - name: "include role nginx-domain-setup for {{application_id}}" - include_role: + include_role: name: nginx-domain-setup + vars: + domain: "{{ domains[application_id] }}" + http_port: "{{ ports.localhost.http[application_id] }}" - name: "copy docker-compose.yml and env file" include_tasks: copy-docker-compose-and-env.yml