From 51265d5da97845962a2594dbda1a999c0946ace7 Mon Sep 17 00:00:00 2001 From: Jack Ivanov Date: Wed, 6 Jun 2018 15:11:32 +0300 Subject: [PATCH] Rename variables --- config.cfg | 4 ++-- roles/vpn/defaults/main.yml | 2 +- roles/vpn/tasks/openssl.yml | 2 +- roles/wireguard/tasks/keys.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.cfg b/config.cfg index e4896f2f..b6f97bb5 100644 --- a/config.cfg +++ b/config.cfg @@ -10,8 +10,8 @@ users: ### Advanced users only below this line ### -# If True re-init all existing certificates. (True or False) -easyrsa_reinit_existent: False +# If True re-init all existing certificates. Boolean +keys_clean_all: False vpn_network: 10.19.48.0/24 vpn_network_ipv6: 'fd9d:bc11:4020::/48' diff --git a/roles/vpn/defaults/main.yml b/roles/vpn/defaults/main.yml index b7a102b0..51b06bf8 100644 --- a/roles/vpn/defaults/main.yml +++ b/roles/vpn/defaults/main.yml @@ -16,7 +16,7 @@ wireguard_network_ipv6: clients_start: 100 wireguard_vpn_network: "{{ wireguard_network_ipv4['subnet'] }}/{{ wireguard_network_ipv4['prefix'] }}" wireguard_vpn_network_ipv6: "{{ wireguard_network_ipv6['subnet'] }}/{{ wireguard_network_ipv6['prefix'] }}" -easyrsa_reinit_existent: false +keys_clean_all: false wireguard_dns_servers: >- {% if local_dns|default(false)|bool or dns_encryption|default(false)|bool == true %} {{ local_service_ip }} diff --git a/roles/vpn/tasks/openssl.yml b/roles/vpn/tasks/openssl.yml index 2e342663..acd966c6 100644 --- a/roles/vpn/tasks/openssl.yml +++ b/roles/vpn/tasks/openssl.yml @@ -9,7 +9,7 @@ file: dest: configs/{{ IP_subject_alt_name }}/pki state: absent - when: easyrsa_reinit_existent|bool == True + when: keys_clean_all|bool == True - name: Ensure the pki directories exist file: diff --git a/roles/wireguard/tasks/keys.yml b/roles/wireguard/tasks/keys.yml index 322f974f..fdfdf53a 100644 --- a/roles/wireguard/tasks/keys.yml +++ b/roles/wireguard/tasks/keys.yml @@ -3,7 +3,7 @@ file: dest: "/etc/wireguard/private_{{ item }}.lock" state: absent - when: easyrsa_reinit_existent|bool == True + when: keys_clean_all|bool == True with_items: - "{{ users }}" - "{{ IP_subject_alt_name }}"