From 35d058c2db0ad466a4c73261128806056ebd97b3 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 26 Apr 2024 21:26:53 +0200
Subject: initial support for ubuntu 24.04

---
 roles/apt-repo/base/tasks/main.yml |  8 ++++++++
 roles/ws/base/defaults/main.yml    |  1 +
 roles/ws/base/tasks/main.yml       | 11 ++++++++---
 roles/ws/minet/tasks/main.yml      |  7 +++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'roles')

diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml
index 0b127272..132f7702 100644
--- a/roles/apt-repo/base/tasks/main.yml
+++ b/roles/apt-repo/base/tasks/main.yml
@@ -26,3 +26,11 @@
   file:
     path: /etc/apt/apt.conf.d/20apt-esm-hook.conf
     state: absent
+
+- name: remove new-style ubuntu apt source entries
+  loop:
+  - ubuntu.sources
+  - ubuntu.sources.curtin.orig
+  file:
+    path: "/etc/apt/sources.list.d/{{ item }}"
+    state: absent
diff --git a/roles/ws/base/defaults/main.yml b/roles/ws/base/defaults/main.yml
index 883e06a4..69c10f10 100644
--- a/roles/ws/base/defaults/main.yml
+++ b/roles/ws/base/defaults/main.yml
@@ -22,6 +22,7 @@ ws_base_superflous_packages:
   - unattended-upgrades
 
 ws_base_extra_packages: []
+ws_base_extra_snaps: []
 
 
 ### mind that lightdm is case sensitive when it comes to booleans
diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml
index e1a81103..23067abd 100644
--- a/roles/ws/base/tasks/main.yml
+++ b/roles/ws/base/tasks/main.yml
@@ -59,11 +59,11 @@
     - exfatprogs
     state: present
 
-- name: install browser
-  apt:
+- name: install chromium and firefox via snap
+  snap:
     name:
     - firefox
-    - chromium-browser
+    - chromium
     state: present
 
 - name: install multimedia stuff
@@ -104,5 +104,10 @@
     name: "{{ ws_base_extra_packages }}"
     state: present
 
+- name: install extra snaps
+  snap:
+    name: "{{ ws_base_extra_snaps }}"
+    state: present
+
 - name: configure lightdm
   import_tasks: lightdm.yml
diff --git a/roles/ws/minet/tasks/main.yml b/roles/ws/minet/tasks/main.yml
index 35eafa17..269220b0 100644
--- a/roles/ws/minet/tasks/main.yml
+++ b/roles/ws/minet/tasks/main.yml
@@ -67,6 +67,13 @@
     state: stopped
     masked: yes
 
+- name: make sure dhclient and wpa_supplicant is installed
+  apt:
+    name:
+    - isc-dhcp-client
+    - wpasupplicant
+    state: present
+
 - name: create resolvconf symlink to resolvectl
   file:
     src: /usr/bin/resolvectl
-- 
cgit v1.2.3