url_from_doh_provider[doh_provider] (#95)

Co-authored-by: c.geary <[email protected]>
chadgeary · Sep 4, 2023 · beec888 · beec888
1 parent 41036aa
commit beec888
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 289 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 *-setup-*.sh
 *-init-*.yml
 *.swp
+.vscode
diff --git a/etc/aws-two-instances/playbooks/cloudblock_aws_amd64.yml b/etc/aws-two-instances/playbooks/cloudblock_aws_amd64.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -113,29 +128,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -149,7 +141,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2020.10.2/cloudflared-linux-amd64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-amd64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists

diff --git a/etc/aws-two-instances/playbooks/cloudblock_aws_arm.yml b/etc/aws-two-instances/playbooks/cloudblock_aws_arm.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -113,29 +128,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -149,7 +141,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2020.10.2/cloudflared-linux-arm64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-arm64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists

diff --git a/playbooks/cloudblock_amd64.yml b/playbooks/cloudblock_amd64.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -137,29 +152,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -173,7 +165,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2023.6.1/cloudflared-linux-amd64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-amd64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists

diff --git a/playbooks/cloudblock_arm64.yml b/playbooks/cloudblock_arm64.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -140,29 +155,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -176,7 +168,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2023.6.1/cloudflared-linux-arm64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-arm64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists

diff --git a/playbooks/cloudblock_aws_amd64.yml b/playbooks/cloudblock_aws_amd64.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -113,29 +128,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -149,7 +141,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2023.6.1/cloudflared-linux-amd64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-amd64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-amd64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists

diff --git a/playbooks/cloudblock_aws_arm.yml b/playbooks/cloudblock_aws_arm.yml
@@ -5,6 +5,21 @@
   become: true
   tasks:
 
+    - name: Custom facts
+      ansible.builtin.set_fact:
+        url_from_doh:
+          adguard: https://dns.adguard.com/dns-query
+          cloudflare: https://cloudflare-dns.com/dns-query
+          cloudflare-security: https://security.cloudflare-dns.com/dns-query
+          cloudflare-family: https://family.cloudflare-dns.com/dns-query
+          applied-privacy: https://doh.applied-privacy.net/query
+          google: https://dns.google/dns-query
+          hurricane-electric: https://ordns.he.net/dns-query
+          pi-dns: https://doh.pi-dns.com/dns-query
+          quad9-recommended: https://dns.quad9.net/dns-query
+          libre-dns: https://doh.libredns.gr/dns-query
+          opendns: https://doh.opendns.com/dns-query
+
     - name: Docker apt key
       ansible.builtin.get_url:
         url: https://download.docker.com/linux/ubuntu/gpg
@@ -113,29 +128,6 @@
         - httpd-ssl.conf
         - httpd.conf
 
-    - name: DoH Endpoints
-      ansible.builtin.blockinfile:
-        create: true
-        mode: '0644'
-        path: /opt/cloudflared/endpoints
-        block: |
-          adguard https://dns.adguard.com/dns-query
-          cloudflare https://cloudflare-dns.com/dns-query
-          cloudflare-security https://security.cloudflare-dns.com/dns-query
-          cloudflare-family https://family.cloudflare-dns.com/dns-query
-          applied-privacy https://doh.applied-privacy.net/query
-          google https://dns.google/dns-query
-          hurricane-electric https://ordns.he.net/dns-query
-          pi-dns https://doh.pi-dns.com/dns-query
-          quad9-recommended https://dns.quad9.net/dns-query
-          libre-dns https://doh.libredns.gr/dns-query
-          opendns https://doh.opendns.com/dns-query
-
-    - name: Set DoH URL from DoH provider var
-      ansible.builtin.shell: |
-        awk '/{{ doh_provider }}/ { print $2 }' /opt/cloudflared/endpoints
-      register: doh_url
-
     - name: Cloudflared Dockerfile
       ansible.builtin.blockinfile:
         create: true
@@ -149,7 +141,7 @@
               apt-get install -y wget && \
               wget https://github.com/cloudflare/cloudflared/releases/download/2023.6.1/cloudflared-linux-arm64 --directory-prefix=/usr/local/bin/ && \
               chmod 555 /usr/local/bin/cloudflared-linux-arm64
-          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ doh_url.stdout }}"]
+          ENTRYPOINT ["/usr/local/bin/cloudflared-linux-arm64", "proxy-dns","--address", "{{ docker_doh }}", "--port", "53", "--upstream", "{{ url_from_doh_provider[doh_provider] }}"]
       register: cloudflared_doh_dockerfile
 
     - name: Check cloudflared image exists