Merge branch 'master' into IMP-more-flexible-vhosts

.ansible-lint

@@ -3,14 +3,14 @@
 # Ansible managed
 #
 exclude_paths:
-  - ./molecule/default/prepare.yml
-  - ./molecule/default/converge.yml
-  - ./molecule/default/verify.yml
-  - ./molecule/default/collections.yml
-  - ./.tox
-  - ./.cache
-  - ./.github
-  - ./requirements.yml
+  - molecule/default/prepare.yml
+  - molecule/default/converge.yml
+  - molecule/default/verify.yml
+  - molecule/default/collections.yml
+  - .tox
+  - .cache
+  - .github
+  - requirements.yml
 
 skip_list:
   - yaml[truthy]

.github/settings.yml

@@ -5,4 +5,4 @@
 repository:
   description: Install and configure httpd on your system.
   homepage: https://robertdebock.nl/
-  topics: webserver, apache, httpd, installer, package, ansible, molecule, tox, playbook
+  topics: webserver, apache, httpd, installer, package, system, networking, ansible, molecule, tox, playbook

.github/workflows/molecule.yml

@@ -31,16 +31,16 @@ jobs:
         config:
           - image: "enterpriselinux"
             tag: "8"
+          - image: "enterpriselinux"
+            tag: "latest"
           - image: "debian"
             tag: "latest"
           - image: "debian"
-            tag: "bookworm"
+            tag: "bullseye"
           - image: "fedora"
-            tag: "36"
+            tag: "37"
           - image: "fedora"
             tag: "latest"
-          - image: "fedora"
-            tag: "rawhide"
           - image: "opensuse"
             tag: "latest"
           - image: "ubuntu"

.gitlab-ci.yml

@@ -14,16 +14,16 @@ molecule:
     matrix:
       - image: "enterpriselinux"
         tag: "8"
+      - image: "enterpriselinux"
+        tag: "latest"
       - image: "debian"
         tag: "latest"
       - image: "debian"
-        tag: "bookworm"
+        tag: "bullseye"
       - image: "fedora"
-        tag: "36"
+        tag: "37"
       - image: "fedora"
         tag: "latest"
-      - image: "fedora"
-        tag: "rawhide"
       - image: "opensuse"
         tag: "latest"
       - image: "ubuntu"

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-added-large-files
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.32.0
     hooks:
       - id: yamllint
         args: [-c=.yamllint]

README.md

@@ -165,13 +165,13 @@ Here is an overview of related roles:
 
 This role has been tested on these [container images](https://hub.docker.com/u/robertdebock):
 
-| container                                                                           | tags |
-| ----------------------------------------------------------------------------------- | ---- |
-| [EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general) | 8    |
-| [Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)      | all  |
-| [Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)      | all  |
-| [opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)  | all  |
-| [Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)      | all  |
+|container|tags|
+|---------|----|
+|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
+|[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
+|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
+|[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
+|[Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)|all|
 
 The minimum version of Ansible required is 2.12, tests have been done to:
 

meta/main.yml

@@ -11,6 +11,7 @@ galaxy_info:
     - name: EL
       versions:
         - "8"
+        - "9"
     - name: Debian
       versions:
         - all
@@ -30,5 +31,7 @@ galaxy_info:
     - httpd
     - installer
     - package
+    - system
+    - networking
 
 dependencies: []

tasks/assert.yml

@@ -1,12 +1,13 @@
 ---
-- name: assert | Test if httpd_servername is set correctly
+- name: assert | Test httpd_servername
   ansible.builtin.assert:
     that:
       - httpd_servername is defined
       - httpd_servername is string
+      - httpd_servername is not none
     quiet: yes
 
-- name: assert | Test if httpd_port is set correctly
+- name: assert | Test httpd_port
   ansible.builtin.assert:
     that:
       - httpd_port is defined
@@ -15,21 +16,22 @@
       - httpd_port < 65536
     quiet: yes
 
-- name: assert | Test if https_ssl_enable is set correctly
+- name: assert | Test https_ssl_enable
   ansible.builtin.assert:
     that:
       - https_ssl_enable is defined
       - https_ssl_enable is boolean
     quiet: yes
 
-- name: assert | Test if httpd_ssl_servername is set correctly
+- name: assert | Test httpd_ssl_servername
   ansible.builtin.assert:
     that:
       - httpd_ssl_servername is defined
       - httpd_ssl_servername is string
+      - httpd_ssl_servername is not none
     quiet: yes
 
-- name: assert | Test if httpd_ssl_port is set correctly
+- name: assert | Test httpd_ssl_port
   ansible.builtin.assert:
     that:
       - httpd_ssl_port is defined
@@ -39,43 +41,47 @@
       - httpd_ssl_port != httpd_port
     quiet: yes
 
-- name: assert | Test if httpd_locations is set correctly
+- name: assert | Test httpd_locations
   ansible.builtin.assert:
     that:
       - httpd_locations is iterable
     quiet: yes
   when:
     - httpd_locations is defined
 
-- name: assert | Test if item in httpd_locations is set correctly
+- name: assert | Test item in httpd_locations
   ansible.builtin.assert:
     that:
       - item.name is defined
       - item.name is string
+      - item.name is not none
       - item.location is defined
       - item.location is string
+      - item.location is not none
       - item.backend_url is defined
       - item.backend_url is string
+      - item.backend_url is not none
     quiet: yes
   loop: "{{ httpd_locations }}"
   loop_control:
     label: "{{ item.name }}"
   when:
     - httpd_locations is defined
 
-- name: assert | Test if httpd_vhosts is set correctly
+- name: assert | Test httpd_vhosts
   ansible.builtin.assert:
     that:
       - httpd_vhosts is iterable
     quiet: yes
   when:
     - httpd_vhosts is defined
 
-- name: assert | Test if item in httpd_vhosts is set correctly
+- name: assert | Test item in httpd_vhosts
   ansible.builtin.assert:
     that:
       - item.name is defined
       - item.name is string
+      - item.name is not none
       - item.servername is defined
       - item.servername is string
     quiet: yes
@@ -85,7 +91,7 @@
   when:
     - httpd_vhosts is defined
 
-- name: assert | Test if item.create_docroot in httpd_vhosts is set correctly
+- name: assert | Test item.create_docroot in httpd_vhosts
   ansible.builtin.assert:
     that:
       - item.create_docroot is boolean
@@ -97,7 +103,7 @@
     - httpd_vhosts is defined
     - item.create_docroot is defined
 
-- name: assert | Test if item.serveralias in httpd_vhosts is set correctly
+- name: assert | Test item.serveralias in httpd_vhosts
   ansible.builtin.assert:
     that:
       - item.serveralias is iterable
@@ -109,21 +115,22 @@
     - httpd_vhosts is defined
     - item.serveralias is defined
 
-- name: assert | Test if httpd_directories is set correctly
+- name: assert | Test httpd_directories
   ansible.builtin.assert:
     that:
       - httpd_directories is iterable
     quiet: yes
   when:
     - httpd_directories is defined
 
-- name: assert | Test if item.name in httpd_directories is set correctly
+- name: assert | Test item.name in httpd_directories
   ansible.builtin.assert:
     that:
       - item.name is defined
-      - item.name is string
+      - item.name is not none
       - item.path is defined
       - item.path is string
+      - item.path is not none
       - item.option is defined or item.allow_override is defined
     quiet: yes
   loop: "{{ httpd_directories }}"
@@ -132,7 +139,7 @@
   when:
     - httpd_directories is defined
 
-- name: assert | Test if item.options in httpd_directories is set correctly
+- name: assert | Test item.options in httpd_directories
   ansible.builtin.assert:
     that:
       - item.options is iterable
@@ -144,10 +151,11 @@
     - httpd_directories is defined
     - item.options is defined
 
-- name: assert | Test if item.allow_override in httpd_directories is set correctly
+- name: assert | Test item.allow_override in httpd_directories
   ansible.builtin.assert:
     that:
       - item.allow_override is string
+      - item.allow_override is not none
     quiet: yes
   loop: "{{ httpd_directories }}"
   loop_control:
@@ -156,14 +164,14 @@
     - httpd_directories is defined
     - item.allow_override is defined
 
-- name: assert | Test if httpd_remove_example is set correctly
+- name: assert | Test httpd_remove_example
   ansible.builtin.assert:
     that:
       - httpd_remove_example is defined
       - httpd_remove_example is boolean
     quiet: yes
 
-- name: assert | Test if httpd_additionnal_modules is set correctly
+- name: assert | Test httpd_additionnal_modules
   ansible.builtin.assert:
     that:
       - httpd_additionnal_modules is defined

tasks/main.yml

@@ -2,8 +2,9 @@
 # tasks file for httpd
 
 - name: Import assert.yml
-  ansible.builtin.import_tasks: assert.yml
-  run_once: true
+  ansible.builtin.import_tasks:
+    file: assert.yml
+  run_once: yes
   delegate_to: localhost
 
 - name: Install apache httpd
@@ -56,17 +57,20 @@
     - Test httpd configuration validity
 
 - name: Import ssl.yml
-  ansible.builtin.import_tasks: ssl.yml
+  ansible.builtin.import_tasks:
+    file: ssl.yml
   when:
     - https_ssl_enable
 
 - name: Import locations.yml
-  ansible.builtin.import_tasks: locations.yml
+  ansible.builtin.import_tasks:
+    file: locations.yml
   when:
     - httpd_locations is defined
 
 - name: Import vhosts.yml
-  ansible.builtin.import_tasks: vhosts.yml
+  ansible.builtin.import_tasks:
+    file: vhosts.yml
   when:
     - httpd_vhosts is defined
 
@@ -82,7 +86,8 @@
     - ansible_os_family in [ "Debian", "Suse" ]
 
 - name: Import directories.yml
-  ansible.builtin.import_tasks: directories.yml
+  ansible.builtin.import_tasks:
+    file: directories.yml
   when:
     - httpd_directories is defined
 

tox.ini

@@ -3,16 +3,16 @@
 #
 [tox]
 minversion = 4.2.4
-envlist = py{310}-ansible{5,6,7}
+envlist = py{310}-ansible{6,7,8}
 
 skipsdist = true
 
 [testenv]
 deps =
     -rrequirements.txt
-    ansible5: ansible == 5.*
     ansible6: ansible == 6.*
     ansible7: ansible == 7.*
+    ansible8: ansible == 8.*
 commands = molecule test
 setenv =
     TOX_ENVNAME={envname}