From fe43bf6733b6779a75c781c6bae0c66bca87f29d Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Wed, 17 Apr 2024 05:06:45 +0200
Subject: [PATCH] add essential almalinux packages

---
 roles/bootstrap/tasks/main.yml     |  6 +++---
 roles/bootstrap/vars/packages.yml  | 34 ++++++++++++++++++------------
 roles/configuration/tasks/main.yml |  4 ++--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
index 6d6ca49..9e21f9d 100644
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -26,12 +26,12 @@
         - echo "nameserver 1.0.0.1" > /mnt/etc/resolv.conf
         - arch-chroot /mnt dnf --releasever=9 --setopt=install_weak_deps=False install -y {{ role_packages.almalinux | join(' ') }}
 
-    - name: Bootstrap Fedora 39
+    - name: Bootstrap Fedora 40
       when: os | lower == 'fedora'
       shell: "{{ item }}"
       with_items:
-        - dnf --releasever=39 --best --repo=fedora --repo=fedora-updates --installroot=/mnt --setopt=install_weak_deps=False groupinstall -y critical-path-base core
-        - arch-chroot /mnt dnf --releasever=39 --setopt=install_weak_deps=False install -y {{ role_packages.fedora | join(' ') }}
+        - dnf --releasever=40 --best --repo=fedora --repo=fedora-updates --installroot=/mnt --setopt=install_weak_deps=False groupinstall -y critical-path-base core
+        - arch-chroot /mnt dnf --releasever=40 --setopt=install_weak_deps=False install -y {{ role_packages.fedora | join(' ') }}
         - arch-chroot /mnt dnf reinstall -y grub2-efi-x64 kernel
 
     - name: Bootstrap RockyLinux 9
diff --git a/roles/bootstrap/vars/packages.yml b/roles/bootstrap/vars/packages.yml
index 8868e8f..7062744 100644
--- a/roles/bootstrap/vars/packages.yml
+++ b/roles/bootstrap/vars/packages.yml
@@ -1,4 +1,24 @@
 ---
+almalinux:
+  - bind-utils
+  - cloud-init
+  - dhcp-client
+  - efibootmgr
+  - glibc-langpack-en
+  - glibc-langpack-de
+  - grub2
+  - grub2-efi
+  - lrzsz
+  - nc
+  - nfs-utils
+  - nfsv4-client-utils
+  - open-vm-tools
+  - shim
+  - telnet
+  - vim
+  - wget
+  - zstd
+
 archlinux:
   - base
   - btrfs-progs
@@ -126,20 +146,6 @@ fedora:
   - vim-default-editor
   - zstd
 
-almalinux:
-  - cloud-init
-  - dhcp-client
-  - efibootmgr
-  - grub2
-  - grub2-efi-x64-modules
-  - lrzsz
-  - nfs-utils
-  - open-vm-tools
-  - shim
-  - telnet
-  - vim
-  - zstd
-
 rhel8:
   - cloud-init
   - dhcp-client
diff --git a/roles/configuration/tasks/main.yml b/roles/configuration/tasks/main.yml
index 38cfba3..12b7d1a 100644
--- a/roles/configuration/tasks/main.yml
+++ b/roles/configuration/tasks/main.yml
@@ -27,7 +27,7 @@
     - name: Setup locales
       block:
         - name: Configure locale.gen
-          when: os | lower != "rocky"
+          when: os | lower not in ['almalinux', 'fedora', 'rhel8', 'rhel9', 'rocky']
           lineinfile:
             dest: /mnt/etc/locale.gen
             regexp: '{{ item.regex }}'
@@ -36,7 +36,7 @@
             - {regex: en_US\.UTF-8 UTF-8, line: en_US.UTF-8 UTF-8}
 
         - name: Generate locales\
-          when: os | lower != "rocky"
+          when: os | lower not in ['almalinux', 'fedora', 'rhel8', 'rhel9', 'rocky']
           command: arch-chroot /mnt /usr/sbin/locale-gen
 
         - name: Set hostname