mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-11-04 12:18:17 +00:00 
			
		
		
		
	Removed sys-dns-cloudflare-records from web-opt-rdr-www because it's covered by other tasks
This commit is contained in:
		@@ -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
 | 
					- name: Include Cloudflare edge redirect
 | 
				
			||||||
  when: DNS_PROVIDER == 'cloudflare'
 | 
					  include_tasks: _01_cloudflare_edge_redirect.yml
 | 
				
			||||||
  block:
 | 
					  when: 
 | 
				
			||||||
    - name: Include DNS role to set redirects
 | 
					    - DNS_PROVIDER == 'cloudflare'
 | 
				
			||||||
      include_role:
 | 
					    - REDIRECT_WWW_FLAVOR == 'edge'
 | 
				
			||||||
        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
 | 
					 | 
				
			||||||
      include_tasks: _01_cloudflare_edge_redirect.yml
 | 
					 | 
				
			||||||
      when: REDIRECT_WWW_FLAVOR == 'edge'
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user