From d10a86b33175ce2befa70a38730b86c3560a6301 Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Mon, 8 May 2017 22:12:49 +0200 Subject: [PATCH] Revert "define local_dns if dns tag used (#531)" (#532) This reverts commit 627b7d5d9b538adb7007cfdac43e2d988de5ed6e. --- algo | 2 +- playbooks/facts/main.yml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/algo b/algo index b8f1ac9..901bc0f 100755 --- a/algo +++ b/algo @@ -40,7 +40,7 @@ read -p " Do you want to install a DNS resolver on this VPN server, to block ads while surfing? [y/N]: " -r dns_enabled dns_enabled=${dns_enabled:-n} -if [[ "$dns_enabled" =~ ^(y|Y)$ ]]; then ROLES+=" dns"; fi +if [[ "$dns_enabled" =~ ^(y|Y)$ ]]; then ROLES+=" dns"; EXTRA_VARS+=" local_dns=Y"; fi read -p " Do you want each user to have their own account for SSH tunneling? diff --git a/playbooks/facts/main.yml b/playbooks/facts/main.yml index 8c25d6d..7c8516d 100644 --- a/playbooks/facts/main.yml +++ b/playbooks/facts/main.yml @@ -35,9 +35,3 @@ - name: Define the commonName set_fact: IP_subject_alt_name: "{{ IP_subject_alt_name }}" - -- name: The DNS tag is defined - set_fact: - local_dns: Y - tags: - - dns