From c0e6117effbd7678aa518aff944b708a7a56a5b2 2023-12-01 16:24:14
From: Branko Majic <branko@majic.rs>
Date: 2023-12-01 16:24:14
Subject: [PATCH] MAR-189: Added support for Debian 11 Bullseye to web_server role.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 6d5e4e82def12dfcff9c6a1dda0954db81a790a7..34d418187cd24bc8d419648a0794d45503da79ab 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -1494,6 +1494,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 10 (Buster)
+- Debian 11 (Bullseye)
 
 
 Examples
diff --git a/roles/web_server/defaults/main.yml b/roles/web_server/defaults/main.yml
index 1875432a2ad9f10babfa4ec97c64c3803ac92b23..c5eca024a1679a41e45938ab837771130e077774 100644
--- a/roles/web_server/defaults/main.yml
+++ b/roles/web_server/defaults/main.yml
@@ -16,9 +16,11 @@ ECDHE-RSA-CHACHA20-POLY1305:\
 # Internal parameters
 php_fpm_service_name_per_release:
   buster: "php7.3-fpm"
+  bullseye: "php7.4-fpm"
 
 php_base_config_dir_per_release:
   buster: "/etc/php/7.3"
+  bullseye: "/etc/php/7.4"
 
 php_fpm_package_name: "php-fpm"
 php_fpm_service_name: "{{ php_fpm_service_name_per_release[ansible_distribution_release] }}"
diff --git a/roles/web_server/meta/main.yml b/roles/web_server/meta/main.yml
index ac62c3880ddfa5f8c47a80f8e1de029d891ae7ac..f1b4f56b3dd782bd084534879cb257023232a2b5 100644
--- a/roles/web_server/meta/main.yml
+++ b/roles/web_server/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - name: Debian
       versions:
         - 10
+        - 11
diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml
index 0cc90f362a4ef73a5b5be21990b3240ab9e5bfc8..76ab28eacad767b1e4f94fe89f87fae19cf089ab 100644
--- a/roles/web_server/molecule/default/molecule.yml
+++ b/roles/web_server/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ lint:
 platforms:
 
   - name: client
-    box: debian/contrib-buster64
+    box: debian/bullseye64
     memory: 256
     cpus: 1
     interfaces:
@@ -50,6 +50,32 @@ platforms:
         network_name: private_network
         type: static
 
+  - name: parameters-mandatory-bullseye
+    groups:
+      - parameters-mandatory
+      - bullseye
+    box: debian/bullseye64
+    memory: 512
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.31
+        network_name: private_network
+        type: static
+
+  - name: parameters-optional-bullseye
+    groups:
+      - parameters-optional
+      - bullseye
+    box: debian/bullseye64
+    memory: 512
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.32
+        network_name: private_network
+        type: static
+
 provisioner:
   name: ansible
   playbooks:
diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml
index 06a9a42ee679932cba5cc5b04044988b41246474..fb3bea74203adc6c1a75d8ea38193eaddff14fa0 100644
--- a/roles/web_server/molecule/default/prepare.yml
+++ b/roles/web_server/molecule/default/prepare.yml
@@ -27,6 +27,10 @@
           fqdn: parameters-mandatory-buster
         - name: parameters-optional-buster_https
           fqdn: parameters-optional-buster
+        - name: parameters-mandatory-bullseye_https
+          fqdn: parameters-mandatory-bullseye
+        - name: parameters-optional-bullseye_https
+          fqdn: parameters-optional-bullseye
 
     - name: Set-up link to generated X.509 material
       file:
@@ -76,6 +80,8 @@
         192.168.56.11: "client"
         192.168.56.21: "parameters-mandatory-buster"
         192.168.56.22: "parameters-optional-buster"
+        192.168.56.31: "parameters-mandatory-bullseye"
+        192.168.56.32: "parameters-optional-bullseye"
 
     - name: Install curl for testing redirects and webpage content
       apt:
diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py
index e31d2b8ccccd0d6302e2bebe85060ae012f21c3d..ab25ed0e190b7509af8806e1c31b9ce6ddfb266e 100644
--- a/roles/web_server/molecule/default/tests/conftest.py
+++ b/roles/web_server/molecule/default/tests/conftest.py
@@ -29,6 +29,8 @@ def php_info(host):
 
     if ansible_distribution_release == 'buster':
         info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.3-fpm', base_config_dir='/etc/php/7.3')
+    elif ansible_distribution_release == 'bullseye':
+        info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.4-fpm', base_config_dir='/etc/php/7.4')
     else:
         raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)