From bdddb06fccddbd3f3f49b4921f1e100df7060e35 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@triplestack.fr>
Date: Wed, 1 Sep 2021 11:07:54 +0200
Subject: [PATCH] Add Debian Bullseye (11) support

---
 README.md     | 21 +++++++++++----------
 Vagrantfile   | 14 +++++++++++++-
 meta/main.yml |  4 +++-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ee8246f..6b94269 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,20 @@ Features:
 
 Supported OS:
 
-| OS                 | Working | Stable (active support) |
-| ------------------ | ------- | ----------------------- |
-| Debian Jessie (8)  | Yes     | Check latest supported version ([1.5.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.5.0)) |
-| Debian Stretch (9) | Yes     | Yes                     |
-| Debian Buster (10) | Yes     | No                      |
-| FreeBSD 11         | Yes     | No                      |
-| FreeBSD 12         | Yes     | No                      |
+| OS                   | Working | Stable (active support) |
+| -------------------- | ------- | ----------------------- |
+| Debian Jessie (8)    | Yes     | Check latest supported version ([1.5.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.5.0)) |
+| Debian Stretch (9)   | Yes     | Yes                     |
+| Debian Buster (10)   | Yes     | Yes                     |
+| Debian Bullseye (11) | Yes     | Yes                     |
+| FreeBSD 11           | Yes     | No                      |
+| FreeBSD 12           | Yes     | No                      |
 
 Requirements
 ------------
 
-Ansible 2.6+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
+- Ansible >=2.11
+- If you set true to `nginx_backports`, you must install backports repository before lauching this role.
 
 Role Variables
 --------------
@@ -70,7 +72,7 @@ FreeBSD:
 
 ### Misc
 
-- `nginx_debug_role`: set _true_ if you need to see output of no\_log tasks 
+- `nginx_debug_role`: set _true_ if you need to see output of no\_log tasks
 
 About modules
 -------------
@@ -99,7 +101,6 @@ Note
 
 - Active support for Debian.
 - FreeBSD support is experimental (no Travis). I only test (for the moment) 10.2 (but it can work on other versions).
-- I don't manage BackupPC for FreeBSD (PR welcome).
 
 Dependencies
 ------------
diff --git a/Vagrantfile b/Vagrantfile
index 2e364f8..1fed03f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,8 @@ Vagrant.configure("2") do |config|
 
   vms_debian = [
     { :name => "debian-stretch", :box => "debian/stretch64", :vars => {} },
-    { :name => "debian-buster", :box => "debian/buster64", :vars => {} }
+    { :name => "debian-buster", :box => "debian/buster64", :vars => {} },
+    { :name => "debian-bullseye", :box => "debian/bullseye64", :vars => {} }
   ]
 
   vms_freebsd = [
@@ -18,6 +19,7 @@ Vagrant.configure("2") do |config|
   conts = [
     { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => {} },
     { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => {} },
+    { :name => "docker-debian-bullseye", :docker => "hanxhx/vagrant-ansible:debian11", :vars => {} },
   ]
 
   config.vm.network "private_network", type: "dhcp"
@@ -30,6 +32,11 @@ Vagrant.configure("2") do |config|
         d.remains_running = true
         d.has_ssh = true
       end
+
+      if opts[:name].include? "bullseye"
+        m.vm.provision "shell", inline: "[ -f '/root/first_provision' ] || (apt-get update -qq && apt-get -y dist-upgrade && touch /root/first_provision)"
+      end
+
       m.vm.provision "ansible" do |ansible|
         ansible.playbook = "tests/test.yml"
         ansible.verbose = 'vv'
@@ -46,6 +53,11 @@ Vagrant.configure("2") do |config|
         v.cpus = 1
         v.memory = 256
       end
+
+      if opts[:name].include? "bullseye"
+        m.vm.provision "shell", inline: "[ -f '/root/first_provision' ] || (apt-get update -qq && apt-get -y dist-upgrade && touch /root/first_provision)"
+      end
+
       m.vm.provision "ansible" do |ansible|
         ansible.playbook = "tests/test.yml"
         ansible.verbose = 'vv'
diff --git a/meta/main.yml b/meta/main.yml
index 6df101c..43d12cf 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -4,12 +4,13 @@ galaxy_info:
   description: Nginx for Debian / FreeBSD
   company:
   license: GPLv2
-  min_ansible_version: 2.6
+  min_ansible_version: 2.11
   platforms:
   - name: Debian
     versions:
     - stretch
     - buster
+    - bullseye
   - name: FreeBSD
     versions:
     - 11.0
@@ -17,6 +18,7 @@ galaxy_info:
     - 12.0
   galaxy_tags:
   - web
+  - debian
   - proxy
   - http
   - http2