Removed sys-dns-cloudflare-records from web-opt-rdr-www because it's covered by other tasks

This commit is contained in:
2025-09-12 03:55:52 +02:00
parent ce8958cc01
commit 1b42ca46e8

View File

@@ -13,29 +13,8 @@
redirect_domain_mappings: "{{ REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '{ source: \"www.\\1\", target: \"\\1\" }') | map('from_yaml') | list }}" redirect_domain_mappings: "{{ REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '{ source: \"www.\\1\", target: \"\\1\" }') | map('from_yaml') | list }}"
when: REDIRECT_WWW_FLAVOR == 'origin' when: REDIRECT_WWW_FLAVOR == 'origin'
- name: Cloudflare WWW Routines
when: DNS_PROVIDER == 'cloudflare'
block:
- name: Include DNS role to set redirects
include_role:
name: sys-dns-cloudflare-records
vars:
cloudflare_records: |
{%- set bare = REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '\\1') | list -%}
[
{%- for d in bare -%}
{
"type": "A",
"zone": "{{ d | to_zone }}",
"name": "{{ d }}",
"content": "{{ networks.internet.ip4 }}",
"proxied": {{ REDIRECT_WWW_FLAVOR == 'edge' }},
"ttl": 1
}{{ "," if not loop.last else "" }}
{%- endfor -%}
]
when: REDIRECT_WWW_FLAVOR == 'origin'
- name: Include Cloudflare edge redirect - name: Include Cloudflare edge redirect
include_tasks: _01_cloudflare_edge_redirect.yml include_tasks: _01_cloudflare_edge_redirect.yml
when: REDIRECT_WWW_FLAVOR == 'edge' when:
- DNS_PROVIDER == 'cloudflare'
- REDIRECT_WWW_FLAVOR == 'edge'