From 96c090affe7de89daee9dab93b24345a98bcf4ee Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Thu, 25 Apr 2024 20:24:59 -0700
Subject: [PATCH] change NetworkManager connectivity check to a boolean

---
 group_vars/all                                      | 3 +--
 roles/networkmanager/tasks/main.yml                 | 1 -
 roles/networkmanager/templates/connectivity.conf.j2 | 5 +----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/group_vars/all b/group_vars/all
index bfa09f4..5213536 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -51,8 +51,7 @@ mail:
     sync_on: trusted
 
 network:
-    conn_check:
-        interval: 0
+    conn_check: False
     trusted_uuid:
         - 39744b35-2f2f-4a18-9da4-7542a56c28c2
         - d2642f7e-9e58-4b00-82f8-26b4ef76a54e
diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml
index a868e06..a90f75b 100644
--- a/roles/networkmanager/tasks/main.yml
+++ b/roles/networkmanager/tasks/main.yml
@@ -13,7 +13,6 @@
   template:
       src: connectivity.conf.j2
       dest: /etc/NetworkManager/conf.d/20-connectivity.conf
-  when: network.conn_check is defined
 
 - name: Push MAC address randomization config
   template:
diff --git a/roles/networkmanager/templates/connectivity.conf.j2 b/roles/networkmanager/templates/connectivity.conf.j2
index 4e3b464..764915e 100644
--- a/roles/networkmanager/templates/connectivity.conf.j2
+++ b/roles/networkmanager/templates/connectivity.conf.j2
@@ -1,6 +1,3 @@
 # {{ ansible_managed }}
-# HTTP-based connectivity check
 [connectivity]
-{% if network.conn_check.uri is defined %}uri={{ network.conn_check.uri }}{% endif %}
-{% if network.conn_check.interval is defined %}interval={{ network.conn_check.interval }}{% endif %}
-{% if network.conn_check.reponse is defined %}response={{ network.conn_check.response }}{% endif %}
+enabled={{ network.conn_check|lower }}