better check for existence of property

davestephens · Aug 9, 2024 · 3d3bd76 · 3d3bd76
1 parent 5da5978
commit 3d3bd76
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/roles/bitwarden/defaults/main.yml b/roles/bitwarden/defaults/main.yml
@@ -5,7 +5,6 @@ bitwarden_data_directory: "{{ docker_home }}/bitwarden"
 bitwarden_port_a: "19080"
 bitwarden_port_b: "3012"
 bitwarden_hostname: "bitwarden"
-bitwarden_ip_whitelist: "deprecated"
 bitwarden_ip_allowlist: "0.0.0.0/0"
 
 # Keep this token secret, this is password to access admin area of your server!

diff --git a/roles/bitwarden/tasks/main.yml b/roles/bitwarden/tasks/main.yml
@@ -4,7 +4,7 @@
     - name: Check for Deprecated IP Whitelist setting
       ansible.builtin.fail:
         msg: "Use bitwarden_ip_allowlist instead of bitwarden_ip_whitelist! Read https://traefik.io/blog/announcing-traefik-proxy-v2-11/ for more information."
-      when: bitwarden_ip_whitelist != "deprecated"
+      when: bitwarden_ip_whitelist is defined
 
     - name: Create Bitwarden Directories
       ansible.builtin.file:

diff --git a/roles/portainer/defaults/main.yml b/roles/portainer/defaults/main.yml
@@ -8,7 +8,6 @@ portainer_data_directory: "{{ docker_home }}/portainer/config"
 # network
 portainer_port: "9000"
 portainer_hostname: "portainer"
-portainer_ip_whitelist: "deprecated"
 portainer_ip_allowlist: "0.0.0.0/0"
 
 # docker

diff --git a/roles/portainer/tasks/main.yml b/roles/portainer/tasks/main.yml
@@ -4,7 +4,7 @@
     - name: Check for Deprecated IP Whitelist setting
       ansible.builtin.fail:
         msg: "Use portainer_ip_allowlist instead of portainer_ip_whitelist! Read https://traefik.io/blog/announcing-traefik-proxy-v2-11/ for more information."
-      when: portainer_ip_whitelist != "deprecated"
+      when: portainer_ip_whitelist is defined
 
     - name: Create Portainer Directories
       ansible.builtin.file: