From 861124217660f273ea7d6fa81b2b5e9d43975276 Mon Sep 17 00:00:00 2001 From: John Burwell Date: Sat, 26 Apr 2025 13:02:20 -0500 Subject: [PATCH] move ansible into ansible --- {handlers => ansible/handlers}/main.yml | 0 {roles => ansible/roles}/ax25/tasks/main.yml | 0 .../roles}/ax25/templates/ax.network.j2 | 0 .../roles}/ax25/templates/ax25d.service | 0 .../roles}/ax25/templates/axports.j2 | 0 {roles => ansible/roles}/base/tasks/main.yml | 18 +++++++++--------- .../base/templates/unblock-wlan.service.j2 | 0 .../roles}/direwolf/tasks/main.yml | 0 .../roles}/direwolf/templates/direwolf.conf.j2 | 0 .../direwolf/templates/direwolf@.service | 0 .../roles}/direwolf/templates/kisstnc@.service | 0 .../roles}/networking/handlers/main.yml | 0 .../networking/tasks/legacy_networking.yml | 0 .../roles}/networking/tasks/main.yml | 0 .../networking/tasks/systemd_networking.yml | 0 .../tasks/systemd_networking_devices.yml | 0 .../roles}/networking/templates/br0.netdev | 0 .../roles}/networking/templates/br0.network.j2 | 0 .../networking/templates/eth0.network.j2 | 0 .../networking/templates/hostapd.conf.j2 | 0 .../networking/templates/wlan0.network.j2 | 0 {roles => ansible/roles}/tuning/tasks/main.yml | 0 22 files changed, 9 insertions(+), 9 deletions(-) rename {handlers => ansible/handlers}/main.yml (100%) rename {roles => ansible/roles}/ax25/tasks/main.yml (100%) rename {roles => ansible/roles}/ax25/templates/ax.network.j2 (100%) rename {roles => ansible/roles}/ax25/templates/ax25d.service (100%) rename {roles => ansible/roles}/ax25/templates/axports.j2 (100%) rename {roles => ansible/roles}/base/tasks/main.yml (82%) rename {roles => ansible/roles}/base/templates/unblock-wlan.service.j2 (100%) rename {roles => ansible/roles}/direwolf/tasks/main.yml (100%) rename {roles => ansible/roles}/direwolf/templates/direwolf.conf.j2 (100%) rename {roles => ansible/roles}/direwolf/templates/direwolf@.service (100%) rename {roles => ansible/roles}/direwolf/templates/kisstnc@.service (100%) rename {roles => ansible/roles}/networking/handlers/main.yml (100%) rename {roles => ansible/roles}/networking/tasks/legacy_networking.yml (100%) rename {roles => ansible/roles}/networking/tasks/main.yml (100%) rename {roles => ansible/roles}/networking/tasks/systemd_networking.yml (100%) rename {roles => ansible/roles}/networking/tasks/systemd_networking_devices.yml (100%) rename {roles => ansible/roles}/networking/templates/br0.netdev (100%) rename {roles => ansible/roles}/networking/templates/br0.network.j2 (100%) rename {roles => ansible/roles}/networking/templates/eth0.network.j2 (100%) rename {roles => ansible/roles}/networking/templates/hostapd.conf.j2 (100%) rename {roles => ansible/roles}/networking/templates/wlan0.network.j2 (100%) rename {roles => ansible/roles}/tuning/tasks/main.yml (100%) diff --git a/handlers/main.yml b/ansible/handlers/main.yml similarity index 100% rename from handlers/main.yml rename to ansible/handlers/main.yml diff --git a/roles/ax25/tasks/main.yml b/ansible/roles/ax25/tasks/main.yml similarity index 100% rename from roles/ax25/tasks/main.yml rename to ansible/roles/ax25/tasks/main.yml diff --git a/roles/ax25/templates/ax.network.j2 b/ansible/roles/ax25/templates/ax.network.j2 similarity index 100% rename from roles/ax25/templates/ax.network.j2 rename to ansible/roles/ax25/templates/ax.network.j2 diff --git a/roles/ax25/templates/ax25d.service b/ansible/roles/ax25/templates/ax25d.service similarity index 100% rename from roles/ax25/templates/ax25d.service rename to ansible/roles/ax25/templates/ax25d.service diff --git a/roles/ax25/templates/axports.j2 b/ansible/roles/ax25/templates/axports.j2 similarity index 100% rename from roles/ax25/templates/axports.j2 rename to ansible/roles/ax25/templates/axports.j2 diff --git a/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml similarity index 82% rename from roles/base/tasks/main.yml rename to ansible/roles/base/tasks/main.yml index e043838..4a8674f 100644 --- a/roles/base/tasks/main.yml +++ b/ansible/roles/base/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install base system packages - apt: + ansible.builtin.apt: name: - ax25-tools - ax25-apps @@ -14,25 +14,25 @@ - alsa-utils - libasound2-dev state: present - update_cache: yes + update_cache: true - name: Install unblock-wlan service - template: + ansible.builtin.template: src: unblock-wlan.service.j2 dest: /etc/systemd/system/unblock-wlan.service - mode: '0644' + mode: "0644" notify: Reload systemd - name: Ensure /etc/wpa_supplicant/wpa_supplicant.conf exists - file: + ansible.builtin.file: path: /etc/wpa_supplicant/wpa_supplicant.conf state: touch owner: root group: root - mode: '0644' + mode: "0644" - name: Ensure Wi-Fi country is set - blockinfile: + ansible.builtin.blockinfile: path: /etc/wpa_supplicant/wpa_supplicant.conf marker: "# {mark} ANSIBLE MANAGED BLOCK - Wi-Fi Country Setting" block: | @@ -41,7 +41,7 @@ notify: Restart unblock-wlan service - name: Unmask hostapd service - systemd: + ansible.builtin.systemd: name: hostapd - masked: no + masked: false notify: Reload systemd diff --git a/roles/base/templates/unblock-wlan.service.j2 b/ansible/roles/base/templates/unblock-wlan.service.j2 similarity index 100% rename from roles/base/templates/unblock-wlan.service.j2 rename to ansible/roles/base/templates/unblock-wlan.service.j2 diff --git a/roles/direwolf/tasks/main.yml b/ansible/roles/direwolf/tasks/main.yml similarity index 100% rename from roles/direwolf/tasks/main.yml rename to ansible/roles/direwolf/tasks/main.yml diff --git a/roles/direwolf/templates/direwolf.conf.j2 b/ansible/roles/direwolf/templates/direwolf.conf.j2 similarity index 100% rename from roles/direwolf/templates/direwolf.conf.j2 rename to ansible/roles/direwolf/templates/direwolf.conf.j2 diff --git a/roles/direwolf/templates/direwolf@.service b/ansible/roles/direwolf/templates/direwolf@.service similarity index 100% rename from roles/direwolf/templates/direwolf@.service rename to ansible/roles/direwolf/templates/direwolf@.service diff --git a/roles/direwolf/templates/kisstnc@.service b/ansible/roles/direwolf/templates/kisstnc@.service similarity index 100% rename from roles/direwolf/templates/kisstnc@.service rename to ansible/roles/direwolf/templates/kisstnc@.service diff --git a/roles/networking/handlers/main.yml b/ansible/roles/networking/handlers/main.yml similarity index 100% rename from roles/networking/handlers/main.yml rename to ansible/roles/networking/handlers/main.yml diff --git a/roles/networking/tasks/legacy_networking.yml b/ansible/roles/networking/tasks/legacy_networking.yml similarity index 100% rename from roles/networking/tasks/legacy_networking.yml rename to ansible/roles/networking/tasks/legacy_networking.yml diff --git a/roles/networking/tasks/main.yml b/ansible/roles/networking/tasks/main.yml similarity index 100% rename from roles/networking/tasks/main.yml rename to ansible/roles/networking/tasks/main.yml diff --git a/roles/networking/tasks/systemd_networking.yml b/ansible/roles/networking/tasks/systemd_networking.yml similarity index 100% rename from roles/networking/tasks/systemd_networking.yml rename to ansible/roles/networking/tasks/systemd_networking.yml diff --git a/roles/networking/tasks/systemd_networking_devices.yml b/ansible/roles/networking/tasks/systemd_networking_devices.yml similarity index 100% rename from roles/networking/tasks/systemd_networking_devices.yml rename to ansible/roles/networking/tasks/systemd_networking_devices.yml diff --git a/roles/networking/templates/br0.netdev b/ansible/roles/networking/templates/br0.netdev similarity index 100% rename from roles/networking/templates/br0.netdev rename to ansible/roles/networking/templates/br0.netdev diff --git a/roles/networking/templates/br0.network.j2 b/ansible/roles/networking/templates/br0.network.j2 similarity index 100% rename from roles/networking/templates/br0.network.j2 rename to ansible/roles/networking/templates/br0.network.j2 diff --git a/roles/networking/templates/eth0.network.j2 b/ansible/roles/networking/templates/eth0.network.j2 similarity index 100% rename from roles/networking/templates/eth0.network.j2 rename to ansible/roles/networking/templates/eth0.network.j2 diff --git a/roles/networking/templates/hostapd.conf.j2 b/ansible/roles/networking/templates/hostapd.conf.j2 similarity index 100% rename from roles/networking/templates/hostapd.conf.j2 rename to ansible/roles/networking/templates/hostapd.conf.j2 diff --git a/roles/networking/templates/wlan0.network.j2 b/ansible/roles/networking/templates/wlan0.network.j2 similarity index 100% rename from roles/networking/templates/wlan0.network.j2 rename to ansible/roles/networking/templates/wlan0.network.j2 diff --git a/roles/tuning/tasks/main.yml b/ansible/roles/tuning/tasks/main.yml similarity index 100% rename from roles/tuning/tasks/main.yml rename to ansible/roles/tuning/tasks/main.yml