roles/update/tasks/main.yml

@@ -1,47 +1,42 @@
----
-- name: Update and upgrade package managed stuff
-#  when: update
-  block:
-  # - name: Install yay (AUR helper)
+# - name: Install yay (AUR helper)
 
-  # - name: Update and upgrade yay packages
-  #   yay: update_cache=yes upgrade=yes
-  #   when: package_manager == 'yay' or 'yay' in group_names
+# - name: Update and upgrade pacman packages
+#   become: yes
+#   pacman:
+#     executable: yay
+#     update_cache: yes
+#     upgrade: yes
+#   when: 'pacman'
+#   tags: pacman
 
-  - name: Update and upgrade pacman packages
-    become: true
+- name: Update and upgrade pacman packages
+  become: yes
   shell: pacman -Syu --noconfirm
-    when: package_manager == 'yay' or 'yay' in group_names
+  when: package_manager == 'pacman' or 'pacman' in group_names
+  tags: update
 
-  - name: Add some repos (alpine)
-    become: true
+- name: Add some repos (alpine)
+  become: yes
   shell: |
     grep -R 'testing' /etc/apk/repositories
     if [ $? == 1 ]; then
-        echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing'\
-        >>/etc/apk/repositories
+      echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing'>>/etc/apk/repositories
     fi
   when: "'alpine' in group_names"
   tags: update alpine
 
-  - name: Update and upgrade xbps packages
-    become: true
-    shell: xbps-install -Suv
-    when: package_manager == 'xbps' or 'xbps' in group_names
-    tags: update
-
-  - name: Update and upgrade apk packages
-    become: true
+- name: Update and upgrade apk packages
+  become: yes
   apk:
-      update_cache: true
-      upgrade: true
+    update_cache: yes
+    upgrade: yes
   when: package_manager == 'apk' or 'apk' in group_names
   tags: update
 
-  - name: Update and upgrade apt packages
-    become: true
+- name: Update and upgrade apt packages
+  become: yes
   apt:
-      update_cache: true
-      upgrade: true
+    update_cache: yes
+    upgrade: yes
   when: package_manager == 'apt' or 'apt' in group_names
   tags: update

servers.ini

@@ -1,9 +1,3 @@
-# Aliases
-[schwarzerfunke_vpn]
-100.64.69.10
-[void_vpn]
-100.64.69.7
-
 [archy]
 archy.42069.no
 [liten]
@@ -11,28 +5,14 @@ archy.42069.no
 [store]
 stor
 
-# Location based groupings
-[sky:children]
-schwarzerfunke_vpn
-[loftet:children]
-void_vpn
-
-[vpn:children]
-loftet
-sky
-
 [linode:children]
 archy
 [kjellern:children]
 liten
 store
 
-# Package manager groupings
-[yay:children]
-schwarzerfunke_vpn
+[pacman:children]
 archy
 store
-[xbps:children]
-void_vpn
 [apt:children]
 liten