From 556db4bfb643298460dd089d981b2ac92a5567e3 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:53:24 -0400
Subject: [PATCH] 2 vars in detected_network.yml to netplan.yml; FULL/PATHS for
 1-prep

---
 roles/network/tasks/detected_network.yml | 21 +++++++---------
 roles/network/tasks/install.yml          |  4 +--
 roles/network/tasks/main.yml             | 32 +++++++++++++-----------
 roles/network/tasks/netplan.yml          | 13 ++++++++++
 roles/network/tasks/netwarn.yml          |  4 +--
 5 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 01ff42e18..9acffaab6 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -36,25 +36,22 @@
     device_gw: "{{ discovered_wan_iface }}"
   when: ansible_default_ipv4.gateway is defined
 
-- name: Figure out netplan file name
-  shell: ls /etc/netplan
-  register: netplan
-  ignore_errors: True # pre 17.10 doesn't use netplan
-  when: is_ubuntu
+# 2022-07-22: Moved to netplan.yml
+# - name: Figure out netplan file name
+#   shell: ls /etc/netplan
+#   register: netplan
+#   ignore_errors: True # pre 17.10 doesn't use netplan
+#   when: is_ubuntu
 
 - name: Setting dhcpcd_test results
   set_fact:
     dhcpcd_result: "{{ ansible_local.local_facts.dhcpcd }}"
 
-- name: Setting systemd_networkd results
+# 2022-07-22: Copied to netplan.yml (REMOVE DUPLICATE CODE LATER?!)
+- name: "Set 'systemd_networkd_active: True' if local_facts.systemd_networkd confirms"
   set_fact:
     systemd_networkd_active: True
-  when: 'ansible_local.local_facts.systemd_networkd == "enabled"'
-
-- name: Setting systemd_networkd-2 results
-  set_fact:
-    systemd_networkd_active: True
-  when: 'ansible_local.local_facts.systemd_networkd == "enabled-runtime"'
+  when: ansible_local.local_facts.systemd_networkd == "enabled" or ansible_local.local_facts.systemd_networkd == "enabled-runtime"
 
 - name: Setting network_manager results
   set_fact:
diff --git a/roles/network/tasks/install.yml b/roles/network/tasks/install.yml
index 088aac902..4ce34c3c1 100644
--- a/roles/network/tasks/install.yml
+++ b/roles/network/tasks/install.yml
@@ -96,8 +96,8 @@
     dest: /usr/bin/
     mode: 0755
   with_items:
-    - gateway/iiab-internet-on
-    - gateway/iiab-internet-off
+    - roles/network/templates/gateway/iiab-internet-on     # Invoked by 1-prep (so full path needed)
+    - roles/network/templates/gateway/iiab-internet-off    # Invoked by 1-prep (so full path needed)
 
 - name: 'Install /usr/local/sbin/netwarn for pop-ups on boot, if iiab-network should be run'
   include_tasks: roles/network/tasks/netwarn.yml    # Invoked by 1-prep (so full path needed)
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 36359edb1..efea4cf3f 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -25,21 +25,23 @@
   include_tasks: install.yml
   when: network_install and network_installed is undefined
 
-- name: Create /usr/bin/iiab-hotspot-on from template
-  template:
-    src: hostapd/iiab-hotspot-on
-    dest: /usr/bin/iiab-hotspot-on
-    owner: root
-    group: root
-    mode: 0755
-
-- name: Create /usr/bin/iiab-hotspot-off from template
-  template:
-    src: hostapd/iiab-hotspot-off
-    dest: /usr/bin/iiab-hotspot-off
-    owner: root
-    group: root
-    mode: 0755
+# 2022-07-22: Should be done in install.yml above (avoid duplication if poss?)
+#
+# - name: Create /usr/bin/iiab-hotspot-on from template
+#   template:
+#     src: hostapd/iiab-hotspot-on
+#     dest: /usr/bin/iiab-hotspot-on
+#     owner: root
+#     group: root
+#     mode: 0755
+#
+# - name: Create /usr/bin/iiab-hotspot-off from template
+#   template:
+#     src: hostapd/iiab-hotspot-off
+#     dest: /usr/bin/iiab-hotspot-off
+#     owner: root
+#     group: root
+#     mode: 0755
 
 - name: Configuring Network if enabled
   block:
diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml
index 43865d437..2e685be3e 100644
--- a/roles/network/tasks/netplan.yml
+++ b/roles/network/tasks/netplan.yml
@@ -1,3 +1,16 @@
+# 2022-07-22: Moved from detected_network.yml
+- name: Figure out netplan file name
+  shell: ls /etc/netplan
+  register: netplan
+  #ignore_errors: True # pre 17.10 doesn't use netplan
+
+# 2022-07-22: Copied from detected_network.yml (REMOVE DUPLICATE CODE LATER?!)
+- name: "Set 'systemd_networkd_active: True' if local_facts.systemd_networkd confirms"
+  set_fact:
+    systemd_networkd_active: True
+  when: ansible_local.local_facts.systemd_networkd == "enabled" or ansible_local.local_facts.systemd_networkd == "enabled-runtime"
+
+
 - name: Disable cloud-init the easy way
   shell: touch /etc/cloud/cloud-init.disabled
   when: item|trim == "50-cloud-init.yaml"
diff --git a/roles/network/tasks/netwarn.yml b/roles/network/tasks/netwarn.yml
index 91c66c14f..d31b262d7 100644
--- a/roles/network/tasks/netwarn.yml
+++ b/roles/network/tasks/netwarn.yml
@@ -22,7 +22,7 @@
 
 - name: 'Install from template: /usr/share/mate/autostart/netwarn-iiab-network.desktop'
   template:
-    src: netwarn/netwarn-iiab-network.desktop
+    src: roles/network/templates/netwarn/netwarn-iiab-network.desktop    # Invoked by 1-prep (so full path needed)
     dest: /usr/share/mate/autostart/
   when: mate_dir.stat.exists and mate_dir.stat.isdir
 
@@ -34,7 +34,7 @@
 
 - name: 'If a supported graphical OS is detected, install from template: /usr/local/sbin/netwarn'
   template:
-    src: netwarn/netwarn
+    src: roles/network/templates/netwarn/netwarn    # Invoked by 1-prep (so full path needed)
     dest: /usr/local/sbin/
     mode: 0755
   when: lxde_pi_autostart_present or (mate_dir.stat.exists and mate_dir.stat.isdir)