Update modules and use l3d.packages ew role

DO1JLR · DO1JLR · commit f8d4066a46de · 2023-08-01T10:39:42.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "roles/base"]
-	path = roles/do1jlr.base
-	url = https://github.com/roles-ansible/ansible_role_base.git
-  branch = main
 [submodule "roles/ranger"]
 	path = roles/do1jlr.ranger
 	url = https://github.com/roles-ansible/ansible_role_ranger.git
@@ -128,3 +124,6 @@
 [submodule "roles/geerlingguy.mysql"]
 	path = roles/geerlingguy.mysql
 	url = https://github.com/geerlingguy/ansible-role-mysql.git
+[submodule "roles/do1jlr.packages"]
+	path = roles/do1jlr.packages
+	url = https://github.com/roles-ansible/ansible_role_packages.git
diff --git a/collections/ansible_collections/community/crypto b/collections/ansible_collections/community/crypto
@@ -1 +1 @@
-Subproject commit 54b2163c56002cee40d888a2af566acd92705488
+Subproject commit 9ae75d4840e46bafe7dfc496a0a8aea45e7e08be
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit e00e82b0ca5a20cfa744afeff9a98cd141b937aa
+Subproject commit a942545dd2ec718993f95db35ac3e988d24e73a5
diff --git a/collections/ansible_collections/community/mysql b/collections/ansible_collections/community/mysql
@@ -1 +1 @@
-Subproject commit b79fd94d51eb986f413e4e6778d45ab9944ff653
+Subproject commit 94392826e1c094c4c46f46334881b25e839732d1
diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git
@@ -1 +1 @@
-Subproject commit 6325369b41de6c57d4109740f19662225aa14cb0
+Subproject commit 4aa99f0a55cc2f8d935f402fd01e00823ab79940
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
@@ -1,11 +1,11 @@
 ---
 # version check for all supported roles
 submodules_versioncheck: true
-check_ansible_version: '2.14.1'
+check_ansible_version: '2.15.2'
 
-# do1jlr.base
-base__pkg_contrib: true
-base__pkg_non_free_firmware: true
+# l3d.packages
+l3d_pkgs__install_advanced: true
+l3d_pkgs__install_cli: true
 
 # do1jlr.ntp
 ntp_set_time_zone: true
diff --git a/host_vars/mail01.l3d.space/vault.yml b/host_vars/mail01.l3d.space/vault.yml
diff --git a/roles/do1jlr.base b/roles/do1jlr.base
diff --git a/roles/do1jlr.packages b/roles/do1jlr.packages
@@ -0,0 +1 @@
+Subproject commit 5666c1af2323de82ed17449953162d7727c696fe
diff --git a/site.yml b/site.yml
@@ -7,7 +7,7 @@
 - name: General roles for all hosts
   hosts: all
   roles:
-    - {role: do1jlr.base, tags: [default, packages, base]}
+    - {role: do1jlr.packages, tags: [packages, general]}
     - {role: do1jlr.ranger, tags: [packages, ranger]}
     - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}
     - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'}
