From f6b4cb0eddfdcc9590eb4f04c05078928ffa8ca7 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Mon, 23 Sep 2024 15:53:50 +0200
Subject: [PATCH] Consistency changes

---
 .github/workflows/ci.yml         |  9 ++++-----
 Vagrantfile                      | 16 ++++++++--------
 meta/main.yml                    |  5 ++---
 molecule/default/collections.yml |  6 +-----
 molecule/default/molecule.yml    |  2 +-
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc43ab5..02391ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,11 +47,10 @@ jobs:
           - distro: debian10
           - distro: debian11
           - distro: debian12
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
           - distro: ubuntu1804
+            ansible-version: '>=9, <10'
           - distro: ubuntu2004
+          - distro: ubuntu2204
 
     steps:
       - name: Check out the codebase
@@ -65,8 +64,8 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
-
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
       - name: Run Molecule tests
         run: |
           molecule test
diff --git a/Vagrantfile b/Vagrantfile
index 7f58430..5daa6bf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -23,7 +16,14 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
+  },
+  {
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
+    :cpu => "50",
+    :ram => "512"
   },
   {
     :name => "debian-10",
diff --git a/meta/main.yml b/meta/main.yml
index e919379..eae4238 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,9 +1,8 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: postfix
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up a postfix server in Debian-like systems
   license: MIT
@@ -11,9 +10,9 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
+        - jammy
     - name: Debian
       versions:
         - buster
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
index c3d7e2a..1062b36 100644
--- a/molecule/default/collections.yml
+++ b/molecule/default/collections.yml
@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8841165..908aaf6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw