From f717facf41c8f403ace5d7e9f3f5033b1d51ee87 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 8 Dec 2023 18:22:28 +0100 Subject: [PATCH] changed task structure --- roles/docker-mybb/tasks/main.yml | 6 +++--- roles/docker-mybb/vars/main.yml | 2 +- .../create-proxy-with-domain-replace.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename roles/docker-mybb/tasks/mybb-proxy-domain.yml => tasks/create-proxy-with-domain-replace.yml (86%) diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml index 924361e1..781822ab 100644 --- a/roles/docker-mybb/tasks/main.yml +++ b/roles/docker-mybb/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include tasks mybb-proxy-domain.yml" - include_tasks: mybb-proxy-domain.yml - loop: "{{ domains + [mybb_main_domain] }}" +- name: "include tasks create-proxy-with-domain-replace.yml" + include_tasks: create-proxy-with-domain-replace.yml + loop: "{{ domains + [source_domain] }}" loop_control: loop_var: domain diff --git a/roles/docker-mybb/vars/main.yml b/roles/docker-mybb/vars/main.yml index 7a71791c..b1b4554b 100644 --- a/roles/docker-mybb/vars/main.yml +++ b/roles/docker-mybb/vars/main.yml @@ -3,4 +3,4 @@ docker_compose_instance_directory: "{{path_docker_compose_instances}}mybb/" docker_compose_instance_confd_directory: "{{docker_compose_instance_directory}}conf.d/" docker_compose_instance_confd_defaultconf_file: "{{docker_compose_instance_confd_directory}}default.conf" target_mount_conf_d_directory: "/etc/nginx/conf.d/" -mybb_main_domain: "mybb.{{top_domain}}" +source_domain: "mybb.{{top_domain}}" diff --git a/roles/docker-mybb/tasks/mybb-proxy-domain.yml b/tasks/create-proxy-with-domain-replace.yml similarity index 86% rename from roles/docker-mybb/tasks/mybb-proxy-domain.yml rename to tasks/create-proxy-with-domain-replace.yml index 547dc771..713969fc 100644 --- a/roles/docker-mybb/tasks/mybb-proxy-domain.yml +++ b/tasks/create-proxy-with-domain-replace.yml @@ -4,4 +4,4 @@ - name: "include task create-domain-conf.yml" include_tasks: create-domain-conf.yml vars: - nginx_docker_reverse_proxy_extra_configuration: "sub_filter '{{mybb_main_domain}}' '{{domain}}';" + nginx_docker_reverse_proxy_extra_configuration: "sub_filter '{{source_domain}}' '{{domain}}';"