.ansible-lint

@@ -1,4 +0,0 @@
----
-
-enable_list:
-  - fqcn-builtins

.github/workflows/ci.yml

@@ -1,43 +0,0 @@
----
-
-name: ci
-'on':
-  pull_request:
-  push:
-    branches:
-      - master
-
-jobs:
-
-  yaml-lint:
-    name: YAML Lint
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Fetch code
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Install test dependencies.
-        run: pip3 install yamllint
-
-      - name: Lint code.
-        run: |
-          yamllint .
-
-  ansible-lint:
-    name: Ansible Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Fetch code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Run ansible-lint
-        uses: ansible/ansible-lint-action@v6.15.0

.github/workflows/galaxy.yml

@@ -1,17 +0,0 @@
----
-
-name: Deploy on Ansible Galaxy
-
-'on':
-  - push
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: galaxy
-        uses: robertdebock/galaxy-action@1.2.0
-        with:
-          galaxy_api_key: ${{ secrets.galaxy_api_key }}

.github/workflows/molecule.yml

@@ -1,43 +0,0 @@
----
-
-name: Molecule
-
-'on':
-  pull_request:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        scenario:
-          - debian-10
-          - debian-11
-          - debian-12
-          - ubuntu-22.04
-        allowed-to-fail:
-          - false
-        include:
-          - scenario: ubuntu-20.04
-            allowed-to-fail: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: "${{ github.repository }}"
-
-      - name: Molecule
-        uses: gofrolist/molecule-action@v2.3.19
-        with:
-          molecule_options: --base-config molecule/_shared/base.yml
-          molecule_args: --scenario-name ${{ matrix.scenario }}
-          molecule_working_dir: "HanXHX/ansible-nginx"
-        continue-on-error: ${{ matrix.allowed-to-fail }}
-
-      - name: Fake command
-        run: echo "End of job"

.gitignore

@@ -2,5 +2,3 @@
 *.swp
 *.retry
 *.pyc
-/tests/hanxhx.php
-/.idea

.travis.yml

@@ -0,0 +1,40 @@
+env:
+  - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.7,<2.8'
+
+
+matrix:
+  fast_finish: true
+
+sudo: required
+
+dist: trusty
+
+language: python
+python: 2.7
+
+services:
+  - docker
+
+before_install:
+  - wget https://releases.hashicorp.com/vagrant/2.0.1/vagrant_2.0.1_x86_64.deb
+  - sudo dpkg -i vagrant_2.0.1_x86_64.deb
+
+install:
+  - pip install "$ANSIBLE_VERSION"
+
+script:
+  - VAGRANT_DEFAULT_PROVIDER=docker vagrant up $PLATFORM
+  - >
+    VAGRANT_DEFAULT_PROVIDER=docker vagrant provision $PLATFORM
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+  - VAGRANT_DEFAULT_PROVIDER=docker vagrant status
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

.yamllint.yml

@@ -1,6 +0,0 @@
----
-
-extends: default
-
-rules:
-  line-length: disable

README.md

@@ -1,7 +1,7 @@
 Nginx for Debian/FreeBSD Ansible role
 =====================================
 
-[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.nginx-blue.svg)](https://galaxy.ansible.com/HanXHX/nginx/) ![GitHub Workflow Status (master branch)](https://img.shields.io/github/actions/workflow/status/hanxhx/ansible-nginx/molecule.yml?branch=master)
+[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.nginx-blue.svg)](https://galaxy.ansible.com/HanXHX/nginx/) [![Build Status](https://travis-ci.org/HanXHX/ansible-nginx.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-nginx)
 
 Install and configure Nginx on Debian/FreeBSD.
 
@@ -20,23 +20,18 @@ Features:
 
 Supported OS:
 
-| OS                   | Working | Stable (active support)                                                                              |
+| 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 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     | Check latest supported version ([1.9.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.9.0)) | 
+| Debian Stretch (9) | Yes     | Yes                     |
-| Debian Buster (10)   | Yes     | Yes                                                                                                  |
+| Debian Buster (10) | Yes     | No                      |
-| Debian Bullseye (11) | Yes     | Yes                                                                                                  |
+| FreeBSD 11         | Yes     | No                      |
-| Debian Bookworm (12) | Yes     | Not yet :)                                                                                           |
+| FreeBSD 12         | Yes     | No                      |
-| FreeBSD 11           | NA      | No                                                                                                   |
-| FreeBSD 12           | NA      | No                                                                                                   |
-| Ubuntu 20.04         | Yes     | Yes                                                                                                  |
-| Ubuntu 22.04         | Yes     | Yes                                                                                                  |
 
 Requirements
 ------------
 
-- Ansible >=2.11
+Ansible 2.6+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
-- If you set true to `nginx_backports`, you must install backports repository before lauching this role.
 
 Role Variables
 --------------
@@ -60,7 +55,6 @@ FreeBSD:
 - `nginx_error_log_level`: default log level
 - `nginx_auto_config_httpv2`: boolean, auto configure HTTP2 where possible
 - `nginx_fastcgi_fix_realpath`: boolean, use realpath for fastcgi (fix problems with symlinks and PHP opcache)
-- `nginx_default_hsts`: string, default header sent for HSTS
 
 ### Nginx Configuration
 
@@ -69,7 +63,6 @@ FreeBSD:
 - `nginx_pid`: daemon pid file
 - `nginx_events_*`: all variables in events block
 - `nginx_http_*`: all variables in http block
-- `nginx_custom_core`: instructions list (for core, will put data in `/etc/nginx/nginx.conf`)
 - `nginx_custom_http`: instructions list (will put data in `/etc/nginx/conf.d/custom.conf`)
 - `nginx_module_packages`: package list module to install (Debian)
 - `nginx_load_modules`: module list to load (full path), should be used only on FreeBSD
@@ -103,34 +96,14 @@ Fine configuration
 Note
 ----
 
-- Active support for Debian/Ubuntu.
+- Active support for Debian.
-- FreeBSD support is experimental. I only test (for the moment) 10.2 (but it can work on other versions).
+- 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
 ------------
 
-See: [requirements.yml](requirements.yml).
+None
-
-
-If you need to dev this role locally on Vagrant
-------------------------------------------------
-
-Before use vagrant, run once:
-
-```commandline
-ansible-galaxy install -p ./tests/ HanXHX.php,master
-```
-
-If you need to dev this role locally with molecule
---------------------------------------------------
-
-Check available scenarios in [molecule](molecule) directory.
-
-With `debian-12` scenario:
-
-```commandline
-molecule -v -c molecule/_shared/base.yml verify -s debian-12
-```
 
 Example Playbook
 ----------------

Vagrantfile

@@ -6,18 +6,20 @@
 Vagrant.configure("2") do |config|
 
   vms_debian = [
-    { :name => "debian-buster", :box => "debian/buster64", :vars => {} },
+    { :name => "debian-stretch", :box => "debian/stretch64", :vars => { "nginx_php": [{"version": "7.0"}] }},
-    { :name => "debian-bullseye", :box => "debian/bullseye64", :vars => {} }
+    { :name => "debian-stretch-sury", :box => "debian/stretch64", :vars => { "nginx_php": [{"version": "7.1"}], "sury": true }},
+    { :name => "debian-buster", :box => "debian/buster64", :vars => { "nginx_php": [{"version": "7.3"}] }}
   ]
 
   vms_freebsd = [
-    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} },
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE",  :vars => {} },
-    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} }
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
   ]
 
   conts = [
-    { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => {} },
+    { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "nginx_php": [{"version": "7.0"}] }},
-    { :name => "docker-debian-bullseye", :docker => "hanxhx/vagrant-ansible:debian11", :vars => {} },
+    { :name => "docker-debian-stretch-sury", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "nginx_php": [{"version": "7.1"}], "sury": true }},
+    { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => { "nginx_php": [{"version": "7.3"}] }},
   ]
 
   config.vm.network "private_network", type: "dhcp"
@@ -30,11 +32,6 @@ 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'
@@ -51,11 +48,6 @@ 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'
@@ -74,7 +66,7 @@ Vagrant.configure("2") do |config|
         v.cpus = 2
         v.memory = 512
       end
-      m.vm.provision "shell", inline: "[ -e /usr/local/bin/bash ] || pkg install -y python bash"
+      m.vm.provision "shell", inline: "pkg install -y python bash"
       m.vm.provision "ansible" do |ansible|
         ansible.playbook = "tests/test.yml"
         ansible.verbose = 'vv'

defaults/main.yml

@@ -14,19 +14,18 @@ nginx_log_dir: '/var/log/nginx'
 nginx_resolver_hosts: ['8.8.8.8', '8.8.4.4']
 nginx_resolver_valid: '300s'
 nginx_resolver_timeout: '5s'
-nginx_error_log_level: 'warn'   # http://nginx.org/en/docs/ngx_core_module.html#error_log
+nginx_error_log_level: 'warn' # http://nginx.org/en/docs/ngx_core_module.html#error_log
 nginx_auto_config_httpv2: true
 nginx_default_site: null
 nginx_default_site_ssl: null
 nginx_fastcgi_fix_realpath: true
-nginx_default_hsts: 'max-age=63072000; includeSubDomains'
 
 #
 # Nginx directories
 #
 nginx_htpasswd_dir: '{{ nginx_etc_dir }}/htpasswd'
 nginx_ssl_dir: '{{ nginx_etc_dir }}/ssl'
-nginx_helper_dir: '{{ nginx_etc_dir }}/helper'
+nginx_helper_dir: '{{ nginx_etc_dir}}/helper'
 
 #
 # Load upstream
@@ -84,19 +83,6 @@ nginx_http_gzip_disable: '"msie6"'
 # Custom global configuration
 #
 nginx_custom_http: []
-nginx_custom_core: []
-
-#
-# Nginx default
-#
-nginx_default_listen:
-  - '80'
-  - '[::]:80'
-nginx_default_listen_ssl:
-  - '443'
-  - '[::]:443'
-nginx_default_listen_proxy_protocol: []
-nginx_default_listen_proxy_protocol_ssl: []
 
 #
 # Sites
@@ -129,7 +115,7 @@ nginx_load_modules: []
 #
 nginx_dh: null
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
-nginx_dh_length: 2048
+nginx_dh_length: 4096
 
 #
 # acme.sh

doc/freebsd.md

@@ -10,3 +10,8 @@ About modules
 -------------
 
 Dynamic modules must be set with full path (see `nginx_load_modules` path).
+
+Sites not tested
+----------------
+
+- BackupPC

doc/php.md

@@ -2,7 +2,8 @@ PHP
 ===
 
 `nginx_php`:
-  - `upstream_name` (M)
+  - `version`: (M) PHP version
+  - `upstream_name` (O)
   - `sockets`: (O) socket list
 
 If `sockets` is not provided, if uses local unix socket (based on PHP version).
@@ -15,8 +16,8 @@ Each socket have:
 
 XOR
 
-- `host` (M)
+- `host`
-- `port` (M)
+- `port`
-- `weight` (O)
+- `weight`
-- `max_fails` (O)
+- `max_fails`
-- `fail_timeout` (O)
+- `fail_timeout`

doc/site.md

@@ -9,30 +9,14 @@ Common
 ------
 
 - `name`: (M) Domain or list of domain used.
+- `template`: (D) template used to create site. Optional if you set `state`=`absent` or using `redirect_to`.
+- `filename`: (O) Specify filename in /etc/nginx/sites-*. Do NOT specify default (reserved keyword). It will be used for log filenames and directories creation.
 - `state`: (O) Site status. Can be "present" (default), "absent" and "disabled".
-- `filename`: (O) Specify filename in `/etc/nginx/sites-*`. Do NOT specify default (reserved keyword). It will be used for log filenames and directories creation.
-
-(O): Optional
-(M): Mandatory
-(D): Depends other keys...
-
-You can use 2 config (at the same time time):
-
-- pre-built: Some configuration are templated (Wordpress, Symfony...), auto create root dir, perform an "A+" on ssllabs for https... etc
-- custom: Push your own site config template. Usefull when you have a complex configuration.
-
-
-Pre-built site config
----------------------
-
-# Keys
-
-- `template`: (M) template used to create site. Optional if you set `state`=`absent` or using `redirect_to`.
 - `redirect_from`: (O) Domain list to redirect to the first `name`. You can use this key to redirect non-www to www
 - `redirect_to`: (O) Redirect all requests to this domain. Please set scheme (http:// or https:// or $sheme).
 - `headers`: (O) Set additionals header as key/value list. You can append "always" to the value. Show [nginx doc](http://nginx.org/en/docs/http/ngx_http_headers_module.html).
 - `redirect_to_code`: Redirect code (default: 302)
-- `redirect_https`: (O) Boolean. Redirect HTTP to HTTPS. If "true", you _MUST_ set `proto` to `['https']`.
+- `redirect_https`: (O) Boolean. Redirect HTTP to HTTPS. If "true", you _MUST_ set `proto` to ```['https']```.
 - `location`: (O) Add new custom locations (it does not overwrite!)
 - `location_order`: (O) Due to non preditive `location` order, you can provide the good order (see test-location.local in [tests/test.yml](../tests/test.yml)).
 - `location_before`: (O) Add new custom locations before generated location by template
@@ -45,13 +29,19 @@ Pre-built site config
 - `proto`: (O) list of protocol used. Default is a list with "http". If you need http and https, you must set a list with "http" and "https". You can only set "https" without http support.
 - `ssl_name`: (D) name of the key used when using TLS/SSL. Optional when `proto` contains "https". If you don't set this value, it will search by `name`.
 - `ssl_template` (O) "strong" (default) or "legacy". You can disable SSL helpers and add your own directives by setting "false".
-- `listen_proxy_protocol` (O) Enable proxy protocol on http port.
+- `php_version` (O) Sepecify PHP version (5 or 7)
-- `listen_proxy_protocol_ssl` (O) Enable proxy protocol on https port.
+- `http_proxy_protocol_port` (O) Enable proxy protocol on http port.
-- `hsts` (O) overwrite default header for hsts
+- `https_proxy_protocol_port` (O) Enable proxy protocol on https port.
 
-### Templates
+(O): Optional
+(M): Mandatory
+(D): Depends other keys...
+
+Templates
+---------
 
 - `_base`: static template
+- `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/stretch/fcgiwrap))
 - `_dokuwiki`
 - `_redirect`: should not be called explicitly
 - `_phalcon`: Phalcon PHP Framework
@@ -62,7 +52,8 @@ Pre-built site config
 
 Templates works as parent-child.
 
-### About proxy template
+About proxy template
+--------------------
 
 Proxy template allow you to use Nginx as reverse proxy. Usefull when you have an application service such as Redmine, Jenkins...
 
@@ -73,69 +64,10 @@ You have many key added to site key:
 
 (O) : Optional
 
-### Default sites
+Default sites
+--------------
 
 You can manage default site by setting domain name to these variables.
 
 - `nginx_default_site`
 - `nginx_default_site_ssl`
-
-*IT WORKS ONLY WITH PRE-BUIT SITES*
-
-
-### Example
-
-
-```yaml
-- nginx_sites:
-  - name: 'mywebsite.com'
-    template: '_wordpress'
-    headers:
-      x-ansibled: '1'
-    manage_local_content: false
-```
-
-
-Custom site config 
-------------------
-
-### Keys
-
-- `custom_template`: (M) template path used 
-
-You can add some extra infos if needed.
-
-### Example:
-
-```yaml
-- nginx_sites:
-  - name: 'mycustom-website.com'
-    custom_template: 'my/template_dir/the-template.conf.j2'
-    allow_admin: '192.168.0.0/24'
-```
-
-In `my/template_dir/the-template.conf.j2`:
-
-```
-#
-# {{ ansible_managed }} - {{ item.name }}
-#
-
-server {
-	listen 8080 http2 proxy_protocol;
-    server_name {{ item.name }};
-	index index.html;
-    root /var/www/{{ item.name }};
-
-	location / {
-		try_files $uri $uri/ =404;
-	}
-
-	location /admin {
-		allow {{ item.allow_admin }};
-		deny all;
-	}
-}
-```
-
-

doc/ssl.md

@@ -8,7 +8,7 @@ Variables
 
 - `nginx_dh`: DH content
 - `nginx_dh_length`: DH key length (default is 2048)
-- `nginx_dh_path`: file location
+- `nginx_dh_path`: file localation
 - `nginx_ssl_dir`: directory where you install your SSL/TLS keys
 - `nginx_ssl_pairs`
 
@@ -20,7 +20,7 @@ Note: `name` is used to deploy key/cert. With defaults values dans `name` = "foo
 
 ### Content mode
 
-Key/Cert content is stored in variable. Useful with vault.
+Key/Cert content is stored in variable. Usefull with vault.
 
 - `key`: content of the private key
 - `cert`: content of the public key
@@ -36,7 +36,7 @@ You can use these variables if you use another task/role to manages your certifi
 
 Create a self-signed pair and deploy it. Do not use this feature in production.
 
-- `self_signed`: set true to use this feature
+- `self_signed`: set true to use this featrure
 - `force`: optional feature (default: false), force regen pair (not idempotent)
 
 ### Acme
@@ -45,7 +45,7 @@ Uses acme.sh to create free certificates. It uses HTTP-01 challenge. Use this fe
 
 - `acme`: set true to use this feature. It uses `name` (can be a string or string list).
 
-Have a look to [acme configuration](acme.md configuration).
+Have a look to [acme configuratuion](acme.md configuration).
 
 Tips
 ----

filter_plugins/nginx.py

@@ -1,5 +1,5 @@
 def nginx_site_filename(site):
-    if 'filename' in site:
+    if site.has_key('filename'):
         return site['filename']
     else:
         return nginx_site_name(site)
@@ -14,45 +14,17 @@ def nginx_ssl_dir(pair, ssl_dir):
     return ssl_dir + '/' + nginx_site_filename(pair)
 
 def nginx_key_path(pair, ssl_dir):
-    if 'dest_key' in pair:
+    if pair.has_key('dest_key'):
         return pair['dest_key']
     else:
         return nginx_ssl_dir(pair, ssl_dir) + '/' + nginx_site_filename(pair) + '.key'
 
 def nginx_cert_path(pair, ssl_dir):
-    if 'dest_cert' in pair:
+    if pair.has_key('dest_cert'):
         return pair['dest_cert']
     else:
         return nginx_ssl_dir(pair, ssl_dir) + '/' + nginx_site_filename(pair) + '.crt'
 
-def nginx_all_site_names(site):
-    all_sites = []
-    if isinstance(site['name'], list):
-        all_sites = all_sites + site['name']
-    else:
-        all_sites.append(site['name'])
-
-    if 'redirect_from' in site:
-        if isinstance(site['redirect_from'], list):
-             all_sites = all_sites + site['redirect_from']
-        else:
-            all_sites.append(site['redirect_from'])
-
-    return all_sites
-
-def nginx_search_by_ssl_name(sites, ssl_name):
-    if isinstance(ssl_name, list):
-        comp_ssl_name = ssl_name[0]
-    else:
-        comp_ssl_name = ssl_name
-
-    res = None
-    for site in sites:
-        if 'ssl_name' in site and site['ssl_name'] == comp_ssl_name:
-            res = site
-            break
-    return res
-
 class FilterModule(object):
     ''' Nginx module '''
 
@@ -62,7 +34,5 @@ class FilterModule(object):
             'nginx_site_name': nginx_site_name,
             'nginx_ssl_dir': nginx_ssl_dir,
             'nginx_key_path': nginx_key_path,
-            'nginx_cert_path': nginx_cert_path,
+            'nginx_cert_path': nginx_cert_path
-            'nginx_all_site_names': nginx_all_site_names,
-            'nginx_search_by_ssl_name': nginx_search_by_ssl_name
         }

filter_plugins/php.py

@@ -1,10 +1,19 @@
 def php_default_upstream_socket(php_version):
     return '/run/php/php%s-fpm.sock' % php_version
 
+def php_default_upstream_name(php_version):
+    return 'default_php_%s' % php_version
+
+def php_fpm_service(php_version):
+    return 'php%s-fpm' % php_version
+
 class FilterModule(object):
     ''' PHP module '''
 
     def filters(self):
         return {
             'php_default_upstream_socket': php_default_upstream_socket,
+            'php_default_upstream_name': php_default_upstream_name,
+            'php_fpm_service': php_fpm_service,
+            'php_fpm_package': php_fpm_service
         }

handlers/main.yml

@@ -1,14 +1,46 @@
 ---
 
-- name: Reload nginx
+- name: reload nginx
-  ansible.builtin.service:
+  command: nginx -t
+  notify:
+    - real-reload nginx
+    - docker reload nginx
+
+- name: restart nginx
+  command: nginx -t
+  notify:
+    - real-restart nginx
+    - docker restart nginx
+
+- name: real-reload nginx
+  service:
     name: nginx
     state: reloaded
+  when: ansible_virtualization_type != 'docker'
 
-- name: Restart nginx
+- name: real-restart nginx
-  ansible.builtin.service:
+  service:
     name: nginx
     state: restarted
+  when: ansible_virtualization_type != 'docker'
 
-- name: Setup
+- name: docker reload nginx
-  ansible.builtin.setup:
+  command: service nginx reload
+  args:
+    warn: false
+  when: ansible_virtualization_type == 'docker'
+
+- name: docker restart nginx
+  command: service nginx restart
+  args:
+    warn: false
+  when: ansible_virtualization_type == 'docker'
+
+- name: restart nginx freebsd
+  service:
+    name: nginx
+    state: restarted
+  when: ansible_distribution == "FreeBSD"
+
+- name: setup
+  action: setup

meta/main.yml

@@ -1,37 +1,28 @@
 ---
-
 galaxy_info:
   author: Emilien Mantel
-  namespace: hanxhx
-  role_name: nginx
   description: Nginx for Debian / FreeBSD
-  company: TripleStack
+  company:
   license: GPLv2
-  min_ansible_version: '2.11'
+  min_ansible_version: 2.6
   platforms:
-    - name: Debian
+  - name: Debian
-      versions:
+    versions:
-        - buster
+    - stretch
-        - bullseye
+    - buster
-        - bookworm
+  - name: FreeBSD
-    - name: Ubuntu
+    versions:
-      versions:
+    - 11.0
-        - focal
+    - 11.1
-        - jammy
+    - 12.0
-    - name: FreeBSD
-      versions:
-        - '11.0'
-        - '11.1'
-        - '12.0'
   galaxy_tags:
-    - web
+  - web
-    - debian
+  - proxy
-    - proxy
+  - http
-    - http
+  - http2
-    - http2
+  - https
-    - https
+  - ssl
-    - ssl
+  - tls
-    - tls
+  - nginx
-    - nginx
+  - cdn
-    - cdn
 dependencies: []

molecule/_shared/Dockerfile.j2

@@ -1,19 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-{% if item.env is defined %}
-{% for var, value in item.env.items() %}
-{% if value %}
-ENV {{ var }} {{ value }}
-{% endif %}
-{% endfor %}
-{% endif %}
-
-RUN apt-get update && \
-	apt-get install -y python3 sudo bash ca-certificates iproute2 python-apt-common \
-	&& apt-get clean

molecule/_shared/base.yml

@@ -1,39 +0,0 @@
----
-
-scenario:
-  test_sequence:
-    - dependency
-    - syntax
-    - create
-    - prepare
-    - converge
-    - idempotence
-    - verify
-    - destroy
-dependency:
-  name: galaxy
-  options:
-    requirements-file: ./molecule/_shared/requirements.yml
-    role-file: ./molecule/_shared/requirements.yml
-driver:
-  name: docker
-role_name_check: 1
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_FILTER_PLUGINS: "../../filter_plugins"
-  config_options:
-    defaults:
-      deprecation_warnings: false
-      callback_whitelist: timer,profile_tasks
-      fact_caching: jsonfile
-      fact_caching_connection: ./cache
-      forks: 100
-    connection:
-      pipelining: true
-  playbooks:
-    converge: ../_shared/converge.yml
-    prepare: ../_shared/prepare.yml
-    verify: ../_shared/verify.yml
-verifier:
-  name: ansible

molecule/_shared/converge.yml

@@ -1,20 +0,0 @@
----
-
-- name: Converge
-  hosts: all
-  gather_facts: true
-  vars_files:
-    - vars/misc.yml
-  vars:
-    nginx_debug_role: true
-  tasks:
-    - name: SHELL | Get ngrok public address
-      ansible.builtin.shell: set -o pipefail && curl 'http://127.0.0.1:4040/api/tunnels/command_line' 2> /dev/null | jq -r '.public_url' | cut -d '/' -f 3
-      args:
-        executable: /bin/bash
-      register: ngrok
-      changed_when: false
-
-    - name: Include role
-      ansible.builtin.include_role:
-        name: "hanxhx.nginx"

molecule/_shared/file/test.crt

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDHTCCAgWgAwIBAgIJAJzUwbFlhyxIMA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
-BAMMGnRlc3Qtc3NsLXByZWRlcGxveWVkLmxvY2FsMB4XDTE2MDExMjE2MDUxNVoX
-DTI2MDEwOTE2MDUxNVowJTEjMCEGA1UEAwwadGVzdC1zc2wtcHJlZGVwbG95ZWQu
-bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm4q94vffiU89G
-GO7rjDfr3C32tH9sM5sXqJT+7N5BLYLF0iSRIvy33MtwFu//TV3f+8nLlQuHYVVk
-L6NEvaL8lh+nRexCQ/y+aXMh7lMhuwPXGgPR1LXsTqyDXbmV9c7k/Kwx5qHAcOb9
-d9YzmcOSO4M9v3WMl/4Zw2J7zNYruypxNBgFEwFx3NJ3AztACMYoVOIR5mS8ARX6
-xea4ddii1F41Vch+eiCGP9VZwDhEujhjy9PXvdBtYNwggM6d82Df9wwaFyIW5DU4
-PhpgAngvE2keY0GLy/LaXa6LAW+TCfPMRT2RtDuvqWr+useWF+O3n81TZqM/G7LV
-9iPxkkRNAgMBAAGjUDBOMB0GA1UdDgQWBBSzXW5UY02/S0xrrobZCVOhas6VeDAf
-BgNVHSMEGDAWgBSzXW5UY02/S0xrrobZCVOhas6VeDAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4IBAQC0+Tr0w9aG4f3LG3+WRGKfMopKICNEkA7JrPrvVUq8
-7UgtdrpOUZAL5AKxVVo1rHDdoL/VpjdqHdhyPzaSUl8hppCFsWmdQh4wLKGoyvcN
-AqSGpXTeLSoFJ357F2OIQpXm2lfT2fVGebwyCNFkwpp7klFnmOusSl2/v5Y5cz+A
-WvWrDg3jsNglx3mNLVcjbOSnen2PsZSmcVo27D0el6oDju8jjstyJ+Dvu0WP+CDL
-s/VolFdbei7d4r2dj86OZ/BCZurltyc0wI3NMOdUuA7q4f1MPTRu7qr/ua5ItK92
-Avc+Gjn/Y/aIhzKpPicJQDK6FzxjfhCc8xtk0EjB4IpP
------END CERTIFICATE-----

molecule/_shared/file/test.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDm4q94vffiU89G
-GO7rjDfr3C32tH9sM5sXqJT+7N5BLYLF0iSRIvy33MtwFu//TV3f+8nLlQuHYVVk
-L6NEvaL8lh+nRexCQ/y+aXMh7lMhuwPXGgPR1LXsTqyDXbmV9c7k/Kwx5qHAcOb9
-d9YzmcOSO4M9v3WMl/4Zw2J7zNYruypxNBgFEwFx3NJ3AztACMYoVOIR5mS8ARX6
-xea4ddii1F41Vch+eiCGP9VZwDhEujhjy9PXvdBtYNwggM6d82Df9wwaFyIW5DU4
-PhpgAngvE2keY0GLy/LaXa6LAW+TCfPMRT2RtDuvqWr+useWF+O3n81TZqM/G7LV
-9iPxkkRNAgMBAAECggEAEEeZkczrRpUcP1gQuKEZbFMJFqUhevKkk+V6JAN1pGje
-GK65j1ZFNX2nBo9Hetvsq5doYidvOat+RuMpAvbQIDlBoBzJDN8YWiC7UoAocm9q
-VOdrr4btEO13MogQRuefH/xE8/vMGfKcBvFFNDw6UvxJQ7hVRIWPECf7sLj/vPOC
-OpMKghxcabQqidMPKyyHVPhQjuIvqW/SqBFpD+Ul0Ja1QGdx+p+/EwVmXnei6Kr8
-/ypULreHqIlBLD6McfFehxDV0m5U7qXb5xK3zdUurIhZixKLjbdRrorNInfEvlOh
-vDy+hsF5GSzvn9dRrMAy/QcRPpXU47VNYZ5BfdCBTQKBgQD8VCbdpG5siXSlIjZd
-xypgK1ttp8udTPWC1trnAc+Ku9O+cGmvABxYJA1iR/GDpSfMxglB7OhSecywKrr+
-S7Yjs9e/dyBmvF7U15JJaGp+db2Ct64z7MvqkwSJ5a0qrrZJRFetDdqdH9FPvURs
-B147jbKsPiGcljjXbZlOBHJH9wKBgQDqPqoA3VqYOmvR7Ei8/skY2EOpFpOhSNko
-ARFwUsDNHRk677URH97TCHq5UrwubfCeIcIptXHrMfaTsfq8vPLPykReIMRaknxf
-DULJPHSoeBLrCAZmaWF1JVyYhrLhHNAzQ3u7a/kYIJm87FEZy3Ml6FSZmIGbRBqx
-zqZYKoHs2wKBgQD469tbk7cLg556uYGAidYYAS20w29uwlkAtgxFD9g6OIjuud7I
-MQfFO+uoJOjwwaC9ti+zxY56roVq1PybmP0Zw3T3AQIJ15KFzhQWLte/4U8PATzt
-JJEV2+sCTn3COZDCPpVvttcPYjAOxdwV5j7j6Sl2GeT2oIt6mjg+asyCiQKBgQDk
-LPxu8TBRfv8OMqs8Jrf/EpL9/7b48bxOwpOZJZMXelPcXCm1r6TfTrA1HAmg9Ijh
-kKLQ/CUm5Ll7b3B+L1Qa4r2sLyD11SF/eaxn2BMPFD/hYCTT160ObsF+9h8DN4z7
-kq3RiMDRJth69nuds9fLwj++ipcdhr62G0VgNq/u5wKBgCz/I5J3tPNjrU9YampR
-0gNnUkUfJWbiVMsG9uwL9l0L/ZzQHvELJ523QXQ0v/e/szHCyoX319u8HEQlC0Jw
-Twlj81HDZzruDUB/mcH6Ee3zHKOmmF6ma+CgoYJJElKW89MUttPdmkH2J1QqLz+7
-EGREwqjr8/wm22DzKNiyDXJ0
------END PRIVATE KEY-----

molecule/_shared/prepare.yml

@@ -1,15 +0,0 @@
----
-
-- name: Prepare
-  hosts: all
-  gather_facts: true
-  vars_files:
-    - vars/misc.yml
-
-  tasks:
-
-    - name: INCLUDE_TASKS | Pre tasks related to OS
-      ansible.builtin.include_tasks: "../../tests/includes/pre_{{ ansible_os_family }}.yml"
-
-    - name: INCLUDE_TASKS | Pre_tasks common
-      ansible.builtin.include_tasks: "../../tests/includes/pre_common.yml"

molecule/_shared/requirements.yml

@@ -1,7 +0,0 @@
----
-
-roles:
-  - name: hanxhx.php
-
-collections:
-  - community.general

molecule/_shared/templates/custom_template.conf.j2

@@ -1,16 +0,0 @@
-# {{ ansible_managed }} - custom template
-
-server {
-	listen 80;
-	listen 8888 http2;
-	listen 9999 http2 proxy_protocol;
-	server_name {{ item.name }};
-
-	index index.html index.htm;
-
-	root {{ item.root }};
-
-	location / {
-		try_files $uri $uri/ =404;
-	}
-}

molecule/_shared/vars/misc.yml

@@ -1,259 +0,0 @@
----
-
-# Force SysVinit, since systemd won't work in a Docker container
-ansible_service_mgr: "sysvinit"
-
-# ----------------------------------------
-# Copied from {role_dir}/tests/group_vars/all.yml
-# ----------------------------------------
-
-# Internal vars
-int_ansible_ssl_dir: '/etc/ansible-ssl'
-# Role vars
-nginx_worker_processes: 1    # Ansible+FreeBSD can't detect CPU number
-nginx_apt_package: 'nginx-extras'
-nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
-nginx_custom_core:
-  - 'worker_rlimit_nofile 4242;'
-
-nginx_upstreams:
-  - name: 'test'
-    servers:
-      - path: '127.0.0.1:80'
-        max_conns: 150
-        weight: 10
-        down: false
-  - name: 'test-absent'
-    servers:
-      - path: '127.0.0.1:80'
-        max_conns: 150
-        weight: 10
-        down: false
-    state: 'absent'
-
-nginx_htpasswd:
-  - name: 'hello'
-    description: 'Please login!'
-    users:
-      - name: 'hx'
-        password: 'asdfg'
-        state: 'absent'
-      - name: 'hanx'
-        password: 'qwerty'
-  - name: 'deleteme'
-    description: 'Please login!'
-    users: []
-    state: 'absent'
-
-nginx_acmesh: true
-nginx_acmesh_test: true
-
-nginx_ssl_pairs:
-  - name: '{{ ngrok.stdout }}'
-    acme: true
-  - name: 'test-ssl-selfsigned.local'
-    self_signed: true
-    force: false
-  - name:
-      - 'test-ssl-predeployed.local'
-      - 'test-multiple-name.local'    # Hack: tests for acme with multiple name, without using acme
-    dest_key: "{{ int_ansible_ssl_dir }}/test.key"
-    dest_cert: "{{ int_ansible_ssl_dir }}/test.crt"
-  - name: 'test-ssl.local'
-    key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEpAIBAAKCAQEAvavrJWFp3Al2VwRgKx+4Y2mbRRvoxvyd2pyN0xMJ/tCJscaG
-      8s60v6WZ9FcCOeMkSI2DXsk4z7pbQdQn0h2GDr/5MOJkPAVWSWEN46tpaLZ3v0zp
-      88ZIbnEk1G0PsdFuW/pnLsakPlAMrl1VArFsV6YsatLt30UIYYcRO97StkoOehCx
-      A5w+XqtfHZeQZ0/DS81633gwYUcMuSTUFZ60r7ge1/m77DTSKg3rTVk5sebP8cjS
-      +aWHvxP/GyvvDsT+3gjRJx2/5O3JkfH0zaOsaU2Avj0PR0c5rhynrNO/l1k+GJJB
-      cbBrM+yA8Ofzp4oXUrCfaIq3RuL3Pd+khcKsiwIDAQABAoIBAQCPpAMQ7BUfbosQ
-      m1+5SOx7XR8Z12kSSX3CcY12rJSFRakB2TeZ6rE38lIFmV82N67iw0kaH4nGx3sU
-      /3aoyXMc+IXfX5RJYEFYkQfTw5ywkH9fgQAsfZ2dBlK+DVo1cEYDoj9CTW1VQ4pX
-      Ape+0l8agd5hiBxdWgpe0ctbbARnx584viLiA/iPBDNxKi9zEYw+WP7hSj5QWahr
-      a09tubcC4L6tjvv8CoZTRSKfCW64vWRDvE6vmA+zJN9Arc1WTYzF1KO1Gybwf8h7
-      stJb191smAgGDFhKo0j58ncyAnrS1k4mapm86QQhlfIA6DKvvC0qm3KdQns5b7HM
-      PyzW0hwBAoGBAO2mTVTOsziom9vtBwM0nRMMEgynR2X3EKMJz2mjcCf66f1F+aQ5
-      DvQFM2V8S2s1nGnPh8NKKZ8DxW1NKuR4qx82zeAXpUs9ibHxOnw4YRC485zqc2Wt
-      fSO1OEDYeKyzWP1nGGtCntYUXzJnWn/wz0mBGKzLKTuLwyFIKx1b7bybAoGBAMxR
-      N+lT57rX6d4GUqcgNOuWMZ/D8egnE5+hsoiFnHOisRLOgUgBBSy4rwAZx+rdHYT+
-      RO11L1PLYEzyvnO0f13R+N7aqKwNXDSzZGA+jb4pjkVidIC2smG/JYKJH5Z+kakw
-      mwMKP0wdRZJsCaMgScHmWJS8d6Ox/XJJoWrTWTbRAoGAWJlEgVaiaIArwz1F/QLz
-      gHNik0cWDkSi9jWlFxwwpycbbypUXM5M7dq2g6JoN6sACk6trbgLdlYgl5RKZm06
-      VuPGs0H9hOSHXkix5jfasDJT2G9r4D9ixRo9w6cwriobBjYWW3612tgzeYYgrkwn
-      655uhZUkZSfA8rqGIGbyZfsCgYAf5WH8G+wmIATTc1s92epJCOZwUY+XNVp75itP
-      4sPczX4lOHW4PuiG5cH0GxI5mRE9rNAn3c5on2xGNvMCbyAfDmNyruH8Eg3d8E9w
-      MvO/xw79x/P2EA9i8QszCKMUxGeK6RqZ6+SbxkoRJKqQe77n9UTI228179hoGhSH
-      77ySsQKBgQC8SSZn6a8PpSIIFXB9WCFMwfGFYbUz0wvpaeZP8GKx3BEzMeJqSUaJ
-      hrQgpwQXkueeamlCQcvV3AUCoBRWTYRLDrWiUIXuIgikDWBFp6TBvTnVRI7iktly
-      fNED7jXOSjJqnFmdkZlAI5V8dM++mVYVykJD6jcaVRQvxqFLrhSaRg==
-      -----END RSA PRIVATE KEY-----
-    cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIDBTCCAe2gAwIBAgIJALKJfbk5vuieMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-      BAMMDnRlc3Qtc3NsLmxvY2FsMB4XDTE2MDExMTE2NDI0NFoXDTI2MDEwODE2NDI0
-      NFowGTEXMBUGA1UEAwwOdGVzdC1zc2wubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUA
-      A4IBDwAwggEKAoIBAQC9q+slYWncCXZXBGArH7hjaZtFG+jG/J3anI3TEwn+0Imx
-      xobyzrS/pZn0VwI54yRIjYNeyTjPultB1CfSHYYOv/kw4mQ8BVZJYQ3jq2lotne/
-      TOnzxkhucSTUbQ+x0W5b+mcuxqQ+UAyuXVUCsWxXpixq0u3fRQhhhxE73tK2Sg56
-      ELEDnD5eq18dl5BnT8NLzXrfeDBhRwy5JNQVnrSvuB7X+bvsNNIqDetNWTmx5s/x
-      yNL5pYe/E/8bK+8OxP7eCNEnHb/k7cmR8fTNo6xpTYC+PQ9HRzmuHKes07+XWT4Y
-      kkFxsGsz7IDw5/OnihdSsJ9oirdG4vc936SFwqyLAgMBAAGjUDBOMB0GA1UdDgQW
-      BBRaSF1L+ivPhmIVGQjtviBqZWDS9DAfBgNVHSMEGDAWgBRaSF1L+ivPhmIVGQjt
-      viBqZWDS9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjrgB9+Zuq
-      Rx7T2mRUl4jf75dLabuBQD0ePALTtvNyBSghhzSr90mE7GlFOYAv0JsmEa3R1LVF
-      wLPIdrIhNHpt7hN0PkhUlfgmxBnRSCfhpiq4xxsDVFM7ehtDz4+dv1LUDMXo07+E
-      f24g9aqmypiFzHisUQrYIhtQmHxRpKyGp6kDAW9qNxg6k/Um00aHdYfuD9ER4ksR
-      f8Hto7f+vssKxCRY2OZXqq13PxEwC5+hgAUkTdrycA/moXFuHJi3lCnCND7sSzvG
-      tXBggOusyFZFC4bs2m+V+Z+RN+tK2c/c0nq5HR8MV5HwIm4Z8GoT2/0BfJ00cgWL
-      lVz0gDBfdH8f
-      -----END CERTIFICATE-----
-
-nginx_custom_http:
-  - 'add_header X-ansible 1;'
-  - 'geoip_country {% if ansible_os_family == "Debian" %}/usr/share/GeoIP/GeoIP.dat{% else %}/usr/local/share/GeoIP/GeoIP.dat{% endif %};'
-  - 'map $geoip_country_code $allowed_country {'
-  - '    default yes;'
-  - '    MA no;'
-  - '    DZ no;'
-  - '    TN no;'
-  - '}'
-
-nginx_default_site: 'test.local'
-nginx_default_site_ssl: 'test-ssl-predeployed.local'
-
-nginx_sites:
-  - name:
-      - 'test.local'
-      - 'test-alias.local'
-      - 'test2-alias.local'
-    template: '_base'
-    filename: 'first-test'
-    override_try_files: '$uri/ $uri =404'
-    headers:
-      'X-Frame-Options': 'deny always'
-      'X-ansible-default': '1'
-    manage_local_content: false
-    use_error_log: true
-    more:
-      - 'autoindex off;'
-    location:
-      '/test':
-        - 'return 403;'
-      '/gunther':
-        - 'return 404;'
-      '/status':
-        - 'stub_status on;'
-        - 'access_log off;'
-        - 'allow 127.0.0.1;'
-        - 'deny all;'
-  - name: 'test-htpasswd.local'
-    template: '_base'
-    location_before:
-      '/hello':
-        - htpasswd: 'hello'
-    location:
-      '/public':
-        - htpasswd: false
-    use_error_log: true
-  - name: 'test-htpasswd-all.local'
-    template: '_base'
-    htpasswd: 'hello'
-  - name: 'test-location.local'
-    template: '_base'
-    location_before:
-      '/b':
-        - 'alias /var/tmp;'
-      '/c':
-        - 'alias /var/tmp;'
-    location:
-      '/':
-        - 'alias /var/tmp;'
-      '/a':
-        - 'alias /var/tmp;'
-    location_order_before:
-      - '/b'
-      - '/c'
-    location_order:
-      - '/'
-      - '/a'
-  - name: 'test-php.local'
-    php_upstream: "manual"
-    upstream_params:
-      - 'fastcgi_param FOO bar;'
-    redirect_from:
-      - 'www.test-php.local'
-    template: '_php'
-    use_error_log: true
-    use_access_log: true
-  - name: 'test-php-index.local'
-    template: '_php_index'
-    php_upstream: 'hx_unix'
-  - name: 'test-php-index2.local'
-    template: '_php_index2'
-    php_upstream: 'hx_ip'
-  - name: 'test-proxy.local'
-    listen:
-      - 8080
-    template: '_proxy'
-    upstream_name: 'test'
-    headers:
-      'X-proxyfied': '1'
-  - name: 'deleted.local'
-    state: 'absent'
-  - name: 'redirect-to.local'
-    redirect_to: 'http://test.local'
-  - name: 'test-ssl.local'
-    proto: ['http', 'https']
-    template: '_base'
-  - name:
-      - 'test-ssl-selfsigned.local'
-      - 'www.test-ssl-selfsigned.local'
-    proto: ['http', 'https']
-    template: '_base'
-    hsts: 'max-age=1664;'
-  - name: 'test-ssl-predeployed.local'
-    proto: ['http', 'https']
-    template: '_base'
-    ssl_name: 'test-ssl-predeployed.local'
-    headers:
-      'X-ansible-default': '1'
-    ssl_template: false
-  - name: 'test-ssl-redirect.local'
-    proto: ['https']
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    redirect_https: true
-  - name:
-      - 'test-ssl-redirect-many.local'
-      - 'test-ssl-redirect-many2.local'
-    listen_ssl: [8443]
-    proto: ['https']
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    redirect_https: true
-    redirect_from:
-      - 'www.test-ssl-redirect-many.local'
-      - 'www.test-ssl-redirect-many2.local'
-  - name: 'test-ssl-proxy-protocol.local'
-    proto: ['http', 'https']
-    listen_proxy_protocol: [20080]
-    listen_proxy_protocol_ssl: [20443]
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    headers:
-      'X-Proxy-Protocol': '1'
-  - name: '{{ ngrok.stdout }}'
-    proto: ['http', 'https']
-    listen_proxy_protocol: [21080]
-    listen_proxy_protocol_ssl: [21443]
-    template: '_base'
-    ssl_name: '{{ ngrok.stdout }}'
-    headers:
-      'X-acme': '1'
-  - name: 'test-custom-template.local'
-    custom_template: 'templates/custom_template.conf.j2'
-    root: '/tmp/custom-template'
-
-nginx_php: "{{ [{'upstream_name': 'manual', 'sockets': [{'host': '127.0.0.1', 'port': '9636'}]}] }}"
-nginx_dh_length: 1024

molecule/_shared/verify.yml

@@ -1,19 +0,0 @@
----
-
-- name: Verify
-  hosts: all
-  gather_facts: true
-  vars_files:
-    - vars/misc.yml
-  vars:
-    nginx_root: "/srv/www"
-  tasks:
-    - name: SHELL | Get ngrok public address
-      ansible.builtin.shell: set -o pipefail && curl 'http://127.0.0.1:4040/api/tunnels/command_line' 2> /dev/null | jq -r '.public_url' | cut -d '/' -f 3
-      args:
-        executable: /bin/bash
-      register: ngrok
-      changed_when: false
-
-    - name: INCLUDE_TASKS | Post_tasks common
-      ansible.builtin.include_tasks: "../../tests/includes/post_common.yml"

molecule/debian-10/molecule.yml

@@ -1,13 +0,0 @@
----
-
-platforms:
-  - name: debian-10
-    image: dokken/debian-10
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true

molecule/debian-11/molecule.yml

@@ -1,13 +0,0 @@
----
-
-platforms:
-  - name: debian-11
-    image: dokken/debian-11
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true

molecule/debian-12/molecule.yml

@@ -1,13 +0,0 @@
----
-
-platforms:
-  - name: debian-12
-    image: dokken/debian-12
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true

molecule/ubuntu-20.04/molecule.yml

@@ -1,20 +0,0 @@
----
-
-platforms:
-  - name: ubuntu-20.04
-    image: dokken/ubuntu-20.04
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true
-
-# Segfault on Ubuntu 20.04 with `nginx-extras` package...
-provisioner:
-  inventory:
-    host_vars:
-      ubuntu-20.04:
-        nginx_apt_package: 'nginx-full'

molecule/ubuntu-22.04/molecule.yml

@@ -1,13 +0,0 @@
----
-
-platforms:
-  - name: ubuntu-22.04
-    image: dokken/ubuntu-22.04
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true

requirements.yml

@@ -1,4 +0,0 @@
----
-
-collections:
-  - community.general

tasks/config.yml

@@ -1,35 +1,26 @@
 ---
 
 - name: TEMPLATE | Deploy nginx.conf
-  ansible.builtin.template:
+  template:
     src: "etc/nginx/nginx.conf.j2"
     dest: "{{ nginx_etc_dir }}/nginx.conf"
-    mode: 0644
+  notify: reload nginx
-    owner: root
-    group: root
-  notify: Reload nginx
 
 - name: TEMPLATE | Deploy all helpers
-  ansible.builtin.template:
+  template:
     src: "{{ item }}"
-    dest: "{{ nginx_helper_dir }}/{{ item | basename | regex_replace('.j2$', '') }}"
+    dest: "{{ nginx_helper_dir }}/{{ item | basename | regex_replace('.j2$','') }}"
-    mode: 0644
-    owner: root
-    group: root
   with_fileglob: '../templates/etc/nginx/helper/*.j2'
-  notify: Reload nginx
+  notify: reload nginx
 
 - name: TEMPLATE | Deploy custom http configuration
-  ansible.builtin.template:
+  template:
     src: "etc/nginx/conf.d/custom.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/custom.conf"
-    mode: 0644
+  notify: reload nginx
-    owner: root
-    group: root
-  notify: Reload nginx
 
 - name: LINEINFILE | Fix path
-  ansible.builtin.lineinfile:
+  lineinfile:
     regexp: '{{ item.0.regexp }}'
     line: '{{ item.0.line }}'
     dest: '{{ item.1 }}'
@@ -45,13 +36,10 @@
   when: nginx_fastcgi_fix_realpath
 
 - name: COPY | Add modules manually
-  ansible.builtin.copy:
+  copy:
     content: |
       {% for m in nginx_load_modules %}
       load_module {{ m }};
       {% endfor %}
     dest: "{{ nginx_etc_dir }}/modules-enabled/000-modules.conf"
-    mode: 0644
+  notify: reload nginx
-    owner: root
-    group: root
-  notify: Reload nginx

tasks/htpasswd.yml

@@ -1,21 +1,18 @@
 ---
 
 - name: FILE | Delete htpasswd file
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_htpasswd_dir }}/{{ item.name }}"
     state: absent
   loop: "{{ nginx_htpasswd }}"
   when: item.state is defined and item.state == 'absent'
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role
 
 - name: HTPASSWD | Manage files
-  community.general.htpasswd:
+  htpasswd:
     name: "{{ item.1.name }}"
     password: "{{ item.1.password }}"
     path: "{{ nginx_htpasswd_dir }}/{{ item.0.name }}"
-    mode: 0644
-    owner: root
-    group: root
   loop: "{{ nginx_htpasswd | subelements('users') }}"
   when: item.0.state is not defined or item.0.state == 'present'
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role

tasks/install/Debian.yml

@@ -1,27 +0,0 @@
----
-
-- name: SET_FACT | Bypass https://github.com/ansible/ansible/issues/19874
-  ansible.builtin.set_fact:
-    ansible_distribution_release: 'buster'
-  when: ansible_facts.distribution_major_version == "buster/sid"
-
-- name: APT | Update cache
-  ansible.builtin.apt:
-    update_cache: true
-    cache_valid_time: 3600
-  changed_when: false
-
-- name: APT | Install nginx and dependencies
-  ansible.builtin.apt:
-    pkg: "{{ nginx_apt_package }}"
-    default_release: "{{ ansible_distribution_release + '-backports' if (nginx_backports and ansible_distribution == 'Debian') else ansible_distribution_release }}"
-
-- name: APT | Install nginx modules
-  ansible.builtin.apt:
-    pkg: "{{ nginx_module_packages }}"
-    state: present
-
-- name: APT | Install passlib lib
-  ansible.builtin.apt:
-    pkg: "python3-passlib"
-    state: present

tasks/install/acme.yml

@@ -1,36 +0,0 @@
----
-
-- name: STAT | Check acme.sh is installed
-  ansible.builtin.stat:
-    path: "{{ nginx_acmesh_dir }}"
-  register: acme
-
-- name: Install acme.sh if needed
-  when: not acme.stat.exists
-  block:
-
-    - name: APT | Install git
-      ansible.builtin.apt:
-        pkg: git
-
-    - name: GIT | Get acme.sh
-      ansible.builtin.git:
-        repo: 'https://github.com/Neilpang/acme.sh.git'
-        dest: '{{ nginx_acmesh_git_dir }}'
-        update: false
-        version: master
-
-    - name: COMMAND | Install acme.sh
-      ansible.builtin.command: ./acme.sh --install --home "{{ nginx_acmesh_dir }}"
-      args:
-        chdir: "{{ nginx_acmesh_git_dir }}"
-        creates: "{{ nginx_acmesh_dir }}"
-
-    - name: COMMAND | Force acme.sh to use letsencrypt (instead of zerossl)
-      ansible.builtin.command: '{{ nginx_acmesh_dir }}/acme.sh --set-default-ca --server letsencrypt --home "{{ nginx_acmesh_dir }}"'
-      changed_when: true
-
-- name: FILE | Remove temp acme.sh dir
-  ansible.builtin.file:
-    path: '{{ nginx_acmesh_git_dir }}'
-    state: absent

tasks/install/main.yml

@@ -1,8 +0,0 @@
----
-
-- name: INCLUDE_TASKS | Install
-  ansible.builtin.include_tasks: "{{ ansible_os_family }}.yml"
-
-- name: IMPORT_TASKS | acme
-  ansible.builtin.import_tasks: "acme.yml"
-  when: nginx_acmesh

tasks/install_Debian.yml

@@ -0,0 +1,53 @@
+---
+
+- name: SET_FACT | Bypass https://github.com/ansible/ansible/issues/19874
+  set_fact:
+    ansible_distribution_release: 'buster'
+  when: ansible_facts.distribution_major_version == "buster/sid"
+
+- name: APT | Update cache
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  changed_when: false
+
+- name: APT | Install nginx and dependencies
+  apt:
+    pkg: "{{ nginx_apt_package }}"
+    default_release: "{{ ansible_distribution_release + '-backports' if nginx_backports else ansible_distribution_release }}"
+
+- name: APT | Install nginx modules
+  apt:
+    pkg: "{{ nginx_module_packages }}"
+    state: present
+
+- name: APT | Install python-passlib
+  apt:
+    pkg: python-passlib
+    state: present
+
+- name: STAT | Check acme.sh is installed
+  stat:
+    path: "{{ nginx_acmesh_dir }}"
+  register: acme
+
+- block:
+
+  - name: APT | Install git
+    apt:
+      pkg: git
+
+  - name: GIT | Get acme.sh
+    git:
+      repo: 'https://github.com/Neilpang/acme.sh.git'
+      dest: '{{ nginx_acmesh_git_dir }}'
+      update: no
+      version: master
+
+  - name: COMMAND | Install acme.sh
+    command: ./acme.sh --install --home "{{ nginx_acmesh_dir }}"
+    args:
+      chdir: "{{ nginx_acmesh_git_dir }}"
+      creates: "{{ nginx_acmesh_dir }}"
+
+  when: not acme.stat.exists

tasks/install_FreeBSD.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: PKGNG | Install nginx and related tools
-  community.general.pkgng:
+  pkgng:
     name: "{{ item }}"
     state: present
   loop:
@@ -13,40 +13,40 @@
 #
 # Bypass https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224166#c1
 #
-- name: Bypass https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224166#c1
+- block:
-  when: true
-  block:
 
     - name: COMMAND | Create /usr/local/etc/fdfs/http.conf
-      ansible.builtin.command: touch /usr/local/etc/fdfs/http.conf
+      command: touch /usr/local/etc/fdfs/http.conf
       args:
         creates: /usr/local/etc/fdfs/http.conf
-      notify: Restart nginx
+      register: fd1
 
     - name: LINEINFILE | Tune fdfs
-      ansible.builtin.lineinfile:
+      lineinfile:
         regexp: ^load_fdfs_parameters_from_tracker
         line: load_fdfs_parameters_from_tracker=false
         path: /usr/local/etc/fdfs/mod_fastdfs.conf
-      notify: Restart nginx
+      register: fd2
 
-    - name: META | Flush handlers (Restart nginx when fdfs is tuned)
+    - name: SERVICE | Restart nginx when fdfs is tuned
-      ansible.builtin.meta: flush_handlers
+      service:
+        name: nginx
+        state: restarted
+      when: fd1.changed or fd2.changed
+
+  when: true
 
 - name: FILE | Create configuration dir (like Debian)
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_etc_dir }}/{{ item }}"
     state: directory
-    mode: 0755
-    owner: root
-    group: root
   loop:
     - conf.d
     - sites-available
     - sites-enabled
 
 - name: FILE | Create log directory
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_log_dir }}"
     owner: "{{ nginx_user }}"
     group: wheel
@@ -54,6 +54,6 @@
     state: directory
 
 - name: SERVICE | Enable nginx
-  ansible.builtin.service:
+  service:
     name: nginx
-    enabled: true
+    enabled: yes

tasks/main.yml

@@ -1,30 +1,30 @@
 ---
 
 - name: INCLUDE_VARS | Related to OS
-  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: ['nginx::site', 'nginx::ssl']
 
 - name: INCLUDE_TASKS | Install
-  ansible.builtin.import_tasks: "install/main.yml"
+  include_tasks: "install_{{ ansible_distribution }}.yml"
   tags: ['nginx::site', 'nginx::ssl']
 
 - name: IMPORT_TASKS| Prepare
-  ansible.builtin.import_tasks: prepare.yml
+  import_tasks: prepare.yml
   tags: ['nginx::site', 'nginx::ssl']
 
 - name: IMPORT_TASKS| Install
-  ansible.builtin.import_tasks: config.yml
+  import_tasks: config.yml
 
 - name: IMPORT_TASKS| Upstream configuration
-  ansible.builtin.import_tasks: upstream.yml
+  import_tasks: upstream.yml
 
 - name: IMPORT_TASKS| htpasswd configuration
-  ansible.builtin.import_tasks: htpasswd.yml
+  import_tasks: htpasswd.yml
 
 - name: IMPORT_TASKS| SSL configuration
-  ansible.builtin.import_tasks: ssl/main.yml
+  import_tasks: ssl/main.yml
   tags: ['nginx::ssl']
 
 - name: IMPORT_TASKS| Sites configuration
-  ansible.builtin.import_tasks: site.yml
+  import_tasks: site.yml
   tags: ['nginx::site']

tasks/prepare.yml

@@ -1,17 +1,17 @@
 ---
 
 - name: SHELL | Get Nginx version
-  ansible.builtin.shell: nginx -v 2>&1 | sed -r 's#.*/##;' | cut -d ' ' -f 1
+  shell: nginx -v 2>&1 | sed -r 's#.*/##;' | cut -d ' ' -f 1
   args:
     executable: /bin/sh
   register: nginx_version
   changed_when: false
-  check_mode: false
+  check_mode: no
   tags:
     - skip_ansible_lint
 
 - name: SHELL | Get module list
-  ansible.builtin.shell: |
+  shell: |
     nginx -V 2>&1 |
     tr -- - '\n' |
     grep -A 1 with |
@@ -22,16 +22,16 @@
     executable: /bin/sh
   register: shell_modules
   changed_when: false
-  check_mode: false
+  check_mode: no
   tags:
     - skip_ansible_lint
 
 - name: SET_FACT | Save modules
-  ansible.builtin.set_fact:
+  set_fact:
     nginx_modules: "{{ shell_modules.stdout_lines }}"
 
 - name: FILE | Create folders
-  ansible.builtin.file:
+  file:
     dest: "{{ item.dir }}"
     owner: "{{ item.owner }}"
     mode: "{{ item.mode }}"
@@ -39,9 +39,6 @@
   loop: "{{ nginx_dirs }}"
 
 - name: FILE | Create ansible facts dir
-  ansible.builtin.file:
+  file:
     path: /etc/ansible/facts.d
     state: directory
-    mode: 0755
-    owner: root
-    group: root

tasks/site.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: FAIL | Check filenames
-  ansible.builtin.fail:
+  fail:
     msg: "Forbidden keyword default on site {{ item | nginx_site_name }}"
   when: item.filename is defined and item.filename == 'default'
   loop: "{{ nginx_sites }}"
@@ -9,7 +9,7 @@
     label: "{{ item | nginx_site_name }}"
 
 - name: FAIL | Check HTTPS redir and proto
-  ansible.builtin.fail:
+  fail:
     msg: "You can't have HTTP proto and HTTPS redirection at the same time"
   when:
     ((item.proto is defined and 'http' in item.proto) or (item.proto is not defined)) and
@@ -19,15 +19,12 @@
     label: "{{ item | nginx_site_name }}"
 
 - name: FILE | Create root directory
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_root }}"
     state: directory
-    mode: 0755
-    owner: root
-    group: root
 
 - name: FILE | Create root public folders (foreach nginx_sites)
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_root }}/{{ item | nginx_site_filename }}/public"
     state: directory
     owner: "{{ item.owner | default(nginx_user) }}"
@@ -43,37 +40,21 @@
     label: "{{ item | nginx_site_name }}"
 
 - name: TEMPLATE | Create sites
-  ansible.builtin.template:
+  template:
     src: "etc/nginx/sites-available/{{ item.template if item.redirect_to is not defined else '_redirect' }}.j2"
     dest: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
-    mode: 0644
+  notify: ['reload nginx', 'restart nginx freebsd']
-    owner: root
+  when: item.state is not defined or item.state != 'absent'
-    group: root
-  notify: 'Reload nginx'
-  when: (item.state is not defined or item.state != 'absent') and item.custom_template is not defined
-  loop: "{{ nginx_sites }}"
-  loop_control:
-    label: "{{ item | nginx_site_name }}"
-
-- name: TEMPLATE | Create sites with preconfigured template
-  ansible.builtin.template:
-    src: "{{ item.custom_template }}"
-    dest: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
-    mode: 0644
-    owner: root
-    group: root
-  notify: 'Reload nginx'
-  when: (item.state is not defined or item.state != 'absent') and item.custom_template is defined
   loop: "{{ nginx_sites }}"
   loop_control:
     label: "{{ item | nginx_site_name }}"
 
 - name: FILE | Delete sites
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
     state: absent
   loop: "{{ nginx_sites | product(dirs) | list }}"
-  notify: 'Reload nginx'
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: item.0.state is defined and item.0.state == 'absent'
   vars:
     dirs: ['sites-available', 'sites-enabled']
@@ -81,45 +62,45 @@
     label: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
 
 - name: FILE | Enable sites
-  ansible.builtin.file:
+  file:
     src: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
     dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
     state: link
   loop: "{{ nginx_sites }}"
-  notify: 'Reload nginx'
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: >
     item.state is not defined or item.state == 'present'
   loop_control:
     label: "{{ item | nginx_site_name }}"
 
 - name: FILE | Disable sites
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
     state: absent
   loop: "{{ nginx_sites }}"
-  notify: 'Reload nginx'
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: item.state is defined and item.state == 'disabled'
   loop_control:
     label: "{{ item | nginx_site_name }}"
 
 - name: FILE | Delete default site when explicitely defined
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_etc_dir }}/sites-enabled/default"
     state: absent
-  notify: 'Reload nginx'
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: nginx_default_site is not none
 
 - name: FILE | Auto set default site
-  ansible.builtin.file:
+  file:
     src: "{{ nginx_etc_dir }}/sites-available/default"
     dest: "{{ nginx_etc_dir }}/sites-enabled/default"
     state: link
-  notify: 'Reload nginx'
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: nginx_default_site is none
 
 - name: TEMPLATE | Deploy facts
-  ansible.builtin.template:
+  template:
     src: etc/ansible/facts.d/nginx.fact.j2
     dest: /etc/ansible/facts.d/nginx.fact
     mode: 0644
-  notify: ['Setup']
+  notify: ['setup']

tasks/ssl/acme.yml

@@ -1,103 +1,98 @@
 ---
 
-- name: SET_FACT | Assign default...
+- name: SET_FACT | Assign default..
-  ansible.builtin.set_fact:
+  set_fact:
     acme_create: []
 
 - name: STAT | Check if certificates are already installed
-  ansible.builtin.stat:
+  stat:
-    path: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
+    path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.crt"
   loop: "{{ nginx_ssl_pairs }}"
   when: item.acme is defined and item.acme
   register: acme_installed_certs
 
 - name: SET_FACT | Assign var with certificates to create
-  ansible.builtin.set_fact:
+  set_fact:
-    acme_create: "{{ acme_create | default([]) + [(item.item)] }}"
+    acme_create: "{{ acme_create | default([]) + [ (item.item) ] }}"
   loop: "{{ acme_installed_certs.results }}"
-  when: item.skipped is not defined and (not item.stat.exists or item.stat.size == 0)
+  when: item.skipped is not defined and not item.stat.exists
 
 - name: BLOCK | Start acme
   block:
 
-    - name: TEMPLATE | Create fake site
+  - name: TEMPLATE | Create fake site
-      ansible.builtin.template:
+    template:
-        src: "etc/nginx/conf.d/FAKESITE.conf.j2"
+      src: "etc/nginx/conf.d/FAKESITE.conf.j2"
-        dest: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
+      dest: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
-        mode: 0644
+    loop: "{{ acme_create }}"
-        owner: root
+    register: fake_site
-        group: root
-      loop: "{{ acme_create }}"
-      register: fake_site
-      notify: Restart nginx
 
-    - name: TEMPLATE | Create fake site
+  - name: FILE | Delete current site if needed
-      ansible.builtin.template:
+    file:
-        src: "etc/nginx/conf.d/FAKESITE.conf.j2"
+      path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_name }}"
-        dest: "/tmp/FAKESITE_{{ item | nginx_site_name }}.conf"
+      state: absent
-        mode: 0644
+    loop: "{{ acme_create }}"
-        owner: root
+    when: fake_site.changed
-        group: root
-      loop: "{{ acme_create }}"
 
-    - name: FILE | Delete current site if needed  # noqa: no-handler
+  - name: SERVICE | Restart nginx
-      ansible.builtin.file:
+    service:
-        path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_name }}"
+      name: nginx
-        state: absent
+      state: restarted
-      loop: "{{ acme_create }}"
+    when: fake_site.changed and ansible_virtualization_type != 'docker'
-      when: fake_site.changed
-      notify: Restart nginx
 
-    - name: META | Ensure nginx is restarted if needed
+  - name: COMMAND | Restart nginx
-      ansible.builtin.meta: flush_handlers
+    command: service nginx restart
+    args:
+      warn: false
+    when: fake_site.changed and ansible_virtualization_type == 'docker'
 
-    - name: COMMAND | Get certificates
+  - name: COMMAND | Get certificates
-      ansible.builtin.command: |
+    command: |
-        {{ nginx_acmesh_bin }}
+      {{ nginx_acmesh_bin }}
-          --home {{ nginx_acmesh_dir }}
+        --home {{ nginx_acmesh_dir }}
-          --issue{% for s in nginx_sites | nginx_search_by_ssl_name(item.name) | nginx_all_site_names %} -d {{ s }}{% endfor %}
+        --issue{% if item.name is string %} -d {{ item.name }}{% else %}{% for name in item.name %} -d {{ name }}{% endfor %}{% endif %}
-          --nginx
+        --nginx
-          {% if nginx_acmesh_test %}--test --log{% endif %}
+        {% if nginx_acmesh_test %}--test{% endif %}
-      args:
+    args:
-        creates: "{{ nginx_acmesh_dir }}/{{ item | nginx_site_name }}/fullchain.cer"
+      creates: "{{ nginx_acmesh_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
-      loop: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
-      register: acme_get
+    register: acme_get
-      failed_when: acme_get.rc != 0 and acme_get.rc != 2
+    failed_when: acme_get.rc != 0 and acme_get.rc != 2
-      no_log: "{{ not nginx_debug_role }}"
+    no_log: not nginx_debug_role
 
-    - name: FILE | Create SSL dir per site
+  - name: FILE | Create SSL dir per site
-      ansible.builtin.file:
+    file:
-        path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}"
+      path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}"
-      loop: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
 
-    - name: COMMAND | Install certificates
+  - name: COMMAND | Install certificates
-      ansible.builtin.command: |
+    command: |
-        {{ nginx_acmesh_bin }}
+      {{ nginx_acmesh_bin }}
-          --home {{ nginx_acmesh_dir }}
+        --home {{ nginx_acmesh_dir }}
-          --install-cert -d {{ nginx_sites | nginx_search_by_ssl_name(item | nginx_site_name) | nginx_site_name }}
+        --install-cert -d {{ item | nginx_site_name }}
-          --fullchain-file {{ item | nginx_cert_path(nginx_ssl_dir) }}
+        --fullchain-file {{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.crt
-          --key-file {{ item | nginx_key_path(nginx_ssl_dir) }}
+        --key-file {{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key
-          --reloadcmd "service nginx reload"
+        --reloadcmd "service nginx reload"
-      args:
+    args:
-        creates: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
+      creates: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
-      loop: "{{ nginx_ssl_pairs }}"
+    loop: "{{ nginx_ssl_pairs }}"
-      when: item.acme is defined and item.acme
+    when: item.acme is defined and item.acme
-      notify: Restart nginx
+    notify: restart nginx
 
   rescue:
 
-    - name: FAIL | Explicit
+  - name: FAIL | Explicit
-      ansible.builtin.fail:
+    fail:
-        msg: "Something is bad... Auto crash!"
+      msg: "Something is bad... Auto crash!"
 
   always:
 
-    - name: FILE | Delete fake sites
+  - name: FILE | Delete fake sites
-      ansible.builtin.file:
+    file:
-        path: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
+      path: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
-        state: absent
+      state: absent
-      loop: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
-      notify: Restart nginx
+    notify: restart nginx
 
-    - name: META | Flush handlers
+  - name: META | Flush handlers
-      ansible.builtin.meta: flush_handlers
+    meta: flush_handlers

tasks/ssl/main.yml

@@ -1,8 +1,8 @@
 ---
 
 - name: IMPORT_TASKS | standard.yml
-  ansible.builtin.import_tasks: standard.yml
+  import_tasks: standard.yml
 
 - name: IMPORT_TASKS | acme.yml
-  ansible.builtin.import_tasks: acme.yml
+  import_tasks: acme.yml
   when: nginx_acmesh

tasks/ssl/standard.yml

@@ -1,77 +1,63 @@
 ---
 
-- name: Generate DH if needed
+- block:
+
+  - name: STAT | Get info ajout DH file
+    stat:
+      path: "{{ nginx_dh_path }}"
+      get_checksum: no
+    register: stat_dh_file
+
+  - name: SHELL | Get info about DH file
+    shell: openssl dhparam -in {{ nginx_dh_path }} -text -noout 2>&1 | awk '/DH Parameters/ { print substr($3, 2) }'
+    changed_when: false
+    register: dh_info
+    when: stat_dh_file.stat.exists
+
+  - name: COMMAND | Generate DH file
+    command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
+    when: not stat_dh_file.stat.exists or (dh_info.stdout | int != nginx_dh_length | int)
+    notify: restart nginx
+
   when: nginx_dh is not string
-  block:
-
-    - name: STAT | Get info about DH file
-      ansible.builtin.stat:
-        path: "{{ nginx_dh_path }}"
-        get_checksum: false
-      register: stat_dh_file
-
-    - name: SHELL | Get info about DH file
-      ansible.builtin.shell: |
-        set -o pipefail &&
-        openssl dhparam -in {{ nginx_dh_path }} -text -noout 2>&1 | awk '/DH Parameters/ { print substr($3, 2) }'
-      args:
-        executable: /bin/bash
-      changed_when: false
-      register: dh_info
-      when: stat_dh_file.stat.exists
-
-    - name: COMMAND | Generate DH file  # noqa: no-changed-when
-      ansible.builtin.command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
-      when: not stat_dh_file.stat.exists or (dh_info.stdout | int != nginx_dh_length | int)
-      notify: Restart nginx
 
 - name: COPY | Deploy DH file from vars
-  ansible.builtin.copy:
+  copy:
     content: "{{ nginx_dh }}"
     dest: "{{ nginx_dh_path }}"
-    owner: root
-    group: root
-    mode: 0640
   when: nginx_dh is string
-  notify: Restart nginx
+  notify: restart nginx
 
 - name: FILE | Create SSL directories
-  ansible.builtin.file:
+  file:
     path: "{{ item | nginx_ssl_dir(nginx_ssl_dir) }}"
     state: directory
-    owner: root
-    group: root
-    mode: 0750
   loop: "{{ nginx_ssl_pairs }}"
   when: item.dest_key is not defined or item.dest_cert is not defined
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role
 
 - name: COPY | Deploy SSL keys
-  ansible.builtin.copy:
+  copy:
     content: "{{ item.key }}"
     dest: "{{ item | nginx_key_path(nginx_ssl_dir) }}"
-    owner: root
-    group: root
     mode: 0640
   loop: "{{ nginx_ssl_pairs }}"
   when: item.key is defined
-  notify: Restart nginx
+  notify: restart nginx
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role
 
 - name: COPY | Deploy SSL certs
-  ansible.builtin.copy:
+  copy:
     content: "{{ item.cert }}"
     dest: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
-    owner: root
-    group: root
     mode: 0644
   loop: "{{ nginx_ssl_pairs }}"
   when: item.cert is defined
-  notify: Restart nginx
+  notify: restart nginx
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role
 
 - name: COMMAND | Create self-signed certificates
-  ansible.builtin.command: |
+  command: |
     openssl req
       -new -newkey rsa:2048 -sha256 -days 3650 -nodes -x509
       -subj '/CN={{ item | nginx_site_name }}'
@@ -82,5 +68,5 @@
     creates: "{{ '/tmp/dummy' if item.force is defined and item.force else item | nginx_cert_path(nginx_ssl_dir) }}"
   loop: "{{ nginx_ssl_pairs }}"
   when: item.self_signed is defined
-  notify: Restart nginx
+  notify: restart nginx
-  no_log: "{{ not nginx_debug_role }}"
+  no_log: not nginx_debug_role

tasks/upstream.yml

@@ -1,29 +1,30 @@
 ---
 
 - name: TEMPLATE | Deploy PHP upstream to Nginx
-  ansible.builtin.template:
+  template:
     src: "etc/nginx/conf.d/php.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/php.conf"
-    mode: 0644
+  when: nginx_php | length > 0
-    owner: root
+  notify: reload nginx
-    group: root
+
-  notify: Reload nginx
+- name: FILE | Delete PHP upstream
+  file:
+    path: "{{ nginx_etc_dir }}/conf.d/php.conf"
+    state: absent
+  when: nginx_php | length == 0
 
 - name: TEMPLATE | Deploy other upstreams
-  ansible.builtin.template:
+  template:
     src: "etc/nginx/conf.d/_upstream.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
-    mode: 0644
-    owner: root
-    group: root
   loop: "{{ nginx_upstreams }}"
   when: item.state is not defined or item.state == 'present'
-  notify: Reload nginx
+  notify: reload nginx
 
 - name: FILE | Delete other upstreams
-  ansible.builtin.file:
+  file:
     path: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
     state: absent
   loop: "{{ nginx_upstreams }}"
   when: item.state is defined and item.state == 'absent'
-  notify: Reload nginx
+  notify: reload nginx

templates/etc/nginx/conf.d/FAKESITE.conf.j2

@@ -1,16 +1,8 @@
-{% set site = nginx_sites | nginx_search_by_ssl_name(item.name) %}
-{% set __listen = item.listen | default(nginx_default_listen) %}
-{% set __listen_proxy_protocol = item.listen_proxy_protocol | default(nginx_default_listen_proxy_protocol) %}
-
 server {
-{% for port in __listen %}
+	listen {{ item.acme_port | default('80') }};
-	listen {{ port }};
+	listen [::]:{{ item.acme_port | default('80') }};
-{% endfor %}
-{% for port in __listen_proxy_protocol %}
-	listen {{ port }} proxy_protocol;
-{% endfor %}
 
-	server_name {{ site | nginx_all_site_names | join(" ") }};
+	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(" ") }}{% endif %}{% if item.redirect_from is defined %} {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ item.redirect_from | join(" ") }}{% endif %}{% endif %};
 
 	location / {
 		return 503;

templates/etc/nginx/conf.d/php.conf.j2

@@ -3,27 +3,18 @@
 #
 
 {% for php in nginx_php %}
-upstream {{ php.upstream_name }} {
+upstream {{ php.upstream_name | default((php.version | php_default_upstream_name)) }} {
 {% for sock in php.sockets | default([]) %}
 {% if sock.host is defined %}
     server {{ sock.host }}:{{ sock.port }} weight={{ sock.weight | default('1') }} max_fails={{ sock.max_fails | default('5') }} fail_timeout={{ sock.fail_timeout | default('10s') }};
 {% else %}
-    server unix:{{ sock.unix }} weight={{ sock.weight | default('1') }};
+    server unix:{{ sock.unix | default((php.version | php_default_upstream_socket)) }} weight={{ sock.weight | default('1') }};
 {% endif %}
+{% else %}
+    server unix:{{ php.version | php_default_upstream_socket }} weight=1;
 {% endfor %}
 }
-{% endfor %}
 
-{% if ansible_local.hanxhx_php.fpm_pool is defined%}
-# -------------------------------------------------------
-# Auto-detected PHP config for HanXHX.php ansible role
-# -------------------------------------------------------
-
-{% for php in ansible_local.hanxhx_php.fpm_pool %}
-upstream {{ php.name }} {
-	server {% if php.listen.startswith('/') %}unix:{{ php.listen }}{% else %}{{ php.listen }}{% endif %};
-}
 {% endfor %}
-{% endif %}
 
 # vim:filetype=nginx

templates/etc/nginx/helper/ssl-legacy.j2

@@ -1,23 +1,17 @@
 #
 # {{ ansible_managed }}
-# See: https://ssl-config.mozilla.org/#server=nginx&version=1.18.0&config=intermediate&openssl=1.1.1n&hsts=false&guideline=5.7
+#
 
-ssl_session_timeout 1d;
+ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH:ECDHE-RSA-AES128-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA128:DHE-RSA-AES128-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA128:ECDHE-RSA-AES128-SHA384:ECDHE-RSA-AES128-SHA128:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA128:DHE-RSA-AES128-SHA128:DHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA384:AES128-GCM-SHA128:AES128-SHA128:AES128-SHA128:AES128-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
+ssl_protocols TLSv1.1 TLSv1.2{% if nginx_version.stdout is version('1.13.0', 'ge') %} TLSv1.3{% endif %};
+ssl_prefer_server_ciphers on;
+ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;
-
-ssl_dhparam {{ nginx_dh_path }};
-
-# intermediate configuration
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
-ssl_prefer_server_ciphers off;
-
-# OCSP stapling
 ssl_stapling on;
 ssl_stapling_verify on;
-
+add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
-# Replace with the IP address of your resolver
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
+resolver_timeout {{ nginx_resolver_timeout }};
+ssl_dhparam {{ nginx_dh_path }};
 
 # vim:filetype=nginx

templates/etc/nginx/helper/ssl-strong.j2

@@ -1,21 +1,19 @@
 #
 # {{ ansible_managed }}
-# See: https://ssl-config.mozilla.org/#server=nginx&version=1.18.0&config=modern&openssl=1.1.1n&hsts=false&guideline=5.7
+#
 
-ssl_session_timeout 1d;
+ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384";
-ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
+ssl_protocols TLSv1.2{% if nginx_version.stdout is version('1.13.0', 'ge') %} TLSv1.3{% endif %};
+ssl_prefer_server_ciphers on;
+ssl_ecdh_curve secp384r1;
+ssl_session_timeout 10m;
+ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;
-
-# modern configuration
-ssl_protocols TLSv1.3;
-ssl_prefer_server_ciphers off;
-
-# OCSP stapling
 ssl_stapling on;
 ssl_stapling_verify on;
-
+add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
-# Replace with the IP address of your resolver
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
 resolver_timeout {{ nginx_resolver_timeout }};
+ssl_dhparam {{ nginx_dh_path }};
 
 # vim:filetype=nginx

templates/etc/nginx/nginx.conf.j2

@@ -5,9 +5,6 @@
 user {{ nginx_user }};
 worker_processes {{ nginx_worker_processes }};
 pid {{ nginx_pid }};
-{% for i in nginx_custom_core %}
-{{ i }}
-{% endfor %}
 include {{ nginx_etc_dir }}/modules-enabled/*.conf;
 
 events {

templates/etc/nginx/sites-available/_backuppc.j2

@@ -0,0 +1,33 @@
+{% extends "_base.j2" %}
+
+{% block root %}
+	root /usr/share/backuppc/cgi-bin;
+{% endblock %}
+
+{% block template_try_files %}
+{% endblock %}
+
+{% block template_index %}
+	index index.cgi;
+{% endblock %}
+
+{% block template_local_content %}
+	location ~ /\.ht {
+		deny all;
+	}
+
+	location /backuppc/image {
+		alias /usr/share/backuppc/image;
+		expires 60d;
+	}
+{% endblock %}
+
+{% block template_upstream_location %}
+	location ~ \.cgi$ {
+		gzip off;
+		include fastcgi.conf;
+		fastcgi_pass unix:/var/run/fcgiwrap.socket;
+		fastcgi_index BackupPC_Admin;
+		fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name;
+	}
+{% endblock %}

templates/etc/nginx/sites-available/_base.j2

@@ -1,18 +1,15 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item | nginx_site_name %}
+{% set __main_name =  item | nginx_site_filename %}
-{% set __listen = item.listen | default(nginx_default_listen) %}
+{% set __listen = item.listen | default(['80', '[::]:80']) %}
-{% set __listen_ssl = item.listen_ssl | default(nginx_default_listen_ssl) %}
+{% set __listen_ssl = item.listen_ssl | default(['443', '[::]:443']) %}
-{% set __listen_proxy_protocol = item.listen_proxy_protocol | default(nginx_default_listen_proxy_protocol) %}
+{% set __http_proxy_protocol_port = item.http_proxy_protocol_port | default([]) %}
-{% set __listen_proxy_protocol_ssl = item.listen_proxy_protocol_ssl | default(nginx_default_listen_proxy_protocol_ssl) %}
+{% set __https_proxy_protocol_port = item.https_proxy_protocol_port | default([]) %}
 {% set __location = item.location | default({}) %}
 {% set __location_before = item.location_before | default({}) %}
 {% set __headers = item.headers | default(nginx_servers_default_headers) %}
-{% set __ssl_name = item.ssl_name | default(__main_name) %}
+{% set __ssl_name = item.ssl_name | default(item.name if item.name is string else item.name[0]) %}
 {% set __location_order = item.location_order | default(__location.keys()) %}
 {% set __location_order_before = item.location_order_before | default(__location_before.keys()) %}
-{% set __http2 = nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %}
-{% macro listen_http() %}
-{% endmacro %}
 {% macro server_name(name) %}
 {% if name is string %}{{ name }}{% else %}{{ name | join(" ") }}{% endif %}
 {% endmacro %}
@@ -43,7 +40,7 @@
 {%- endif %}
 {%- endmacro %}
 {% macro ssl(ssl_name) %}
-{% for sn in nginx_ssl_pairs if (sn.name is defined and (sn | nginx_site_name) == ssl_name) %}
+{% for sn in nginx_ssl_pairs if ((sn.name is string and sn.name == ssl_name) or (sn.name.0 == ssl_name)) %}
 	ssl_certificate {{ sn | nginx_cert_path(nginx_ssl_dir) }};
 	ssl_certificate_key {{ sn | nginx_key_path(nginx_ssl_dir) }};
 {% endfor %}
@@ -51,10 +48,7 @@
 {% macro httpsredirect(name) %}
 server {
 {% for port in __listen %}
-	listen {{ port }};
+	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
-{% endfor %}
-{% for port in __listen_proxy_protocol %}
-	listen {{ port }} proxy_protocol;
 {% endfor %}
 	server_name {{ server_name(name) }};
 	location / {
@@ -73,23 +67,16 @@ server {
 server {
 {% if 'http' in __proto %}
 {% for port in __listen %}
-	listen {{ port }}{% if nginx_default_site == __main_name %} default_server{% endif %};
+	listen {{ port }}{% if nginx_default_site == __main_name %} default_server{% endif %}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
-{% endfor %}
-{% for port in __listen_proxy_protocol %}
-	listen {{ port }}{% if nginx_default_site == __main_name %} default_server{% endif %} proxy_protocol;
 {% endfor %}
 {% endif %}
 {% if 'https' in __proto %}
 {% for port in __listen_ssl %}
-	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if __http2 %} http2{% endif %};
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
-{% endfor %}
-{% for port in __listen_proxy_protocol_ssl %}
-	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if __http2 %} http2{% endif %} proxy_protocol;
 {% endfor %}
 {{ ssl(__ssl_name) }}
 {% if item.ssl_template is not defined or item.ssl_template != false %}
 	include {{ nginx_helper_dir + '/ssl-' + item.ssl_template | default('strong') }};
-	add_header Strict-Transport-Security "{{ item.hsts | default(nginx_default_hsts) }}" always;
 {% endif %}
 {% endif %}
 	server_name {{ server_name(item.name) }};
@@ -97,7 +84,7 @@ server {
 {% if item.root is defined %}
 	root {{ item.root }};
 {% else %}
-	root {{ nginx_root }}/{{ item | nginx_site_filename }}/public;
+	root {{ nginx_root }}/{{ __main_name }}/public;
 {% endif %}
 {% endblock %}
 {% block template_index %}
@@ -118,15 +105,15 @@ server {
 
 {% block template_headers %}
 	# --> Custom headers
-{% for key, value in __headers.items() %}
+{% for key, value in __headers.iteritems() %}
-	add_header {{ key }} "{{ value | regex_replace('\s+always$', '') }}"{% if value | regex_search('\s+always$') %} always{% endif %};
+	add_header {{ key }} "{{ value }}";
 {% endfor %}
 	# <-- Custom headers
 {% endblock %}
 
 {{ locations(__location_before, __location_order_before) }}
 
-{% if not '/' in  __location %}
+{% if not __location.has_key('/') %}
 	location / {
 {% block template_try_files %}
 		try_files {{ item.override_try_files | default('$uri $uri/ =404') }};
@@ -195,34 +182,26 @@ server {
 #
 server {
 {% for port in __listen %}
-	listen {{ port }};
+	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
 {% endfor %}
-{% for port in __listen_proxy_protocol %}
-	listen {{ port }} proxy_protocol;
-{% endfor %}
-
 	server_name {{ server_name(item.redirect_from) }};
 	location / {
-		return 301 $scheme://{{ __main_name }}$request_uri;
+		return 301 $scheme://{{ item.name if item.name is string else item.name[0] }}$request_uri;
 	}
 }
 
 {% if 'https' in __proto %}
 server {
 {% for port in __listen_ssl %}
-	listen {{ port }} ssl{% if __http2 %} http2{% endif %};
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
-{% endfor %}
-{% for port in __listen_proxy_protocol_ssl %}
-	listen {{ port }} ssl{% if __http2 %} http2{% endif %} proxy_protocol;
 {% endfor %}
 {{ ssl(__ssl_name) }}
 {% if item.ssl_template is not defined or item.ssl_template != false %}
 	include {{ nginx_helper_dir + '/ssl-' + item.ssl_template | default('strong') }};
-	add_header Strict-Transport-Security "{{ item.hsts | default(nginx_default_hsts) }}" always;
 {% endif %}
 	server_name {{ server_name(item.redirect_from) }};
 	location / {
-		return 301 https://{{ __main_name }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
+		return 301 https://{{ item.name if item.name is string else item.name[0] }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
 	}
 }
 {% endif %}

templates/etc/nginx/sites-available/_php.j2

@@ -1,5 +1,16 @@
 {% extends "_base.j2" %}
 
+{% if item.php_version is defined %}
+{% set php_info = 'Explicit PHP version on site' %}
+{% set php_upstream = (nginx_php|selectattr('version', 'equalto', item.php_version)|first).upstream_name | default(item.php_version | php_default_upstream_name) %}
+{% elif item.php_upstream is defined %}
+{% set php_info = 'Explicit Nginx/PHP upstream on site' %}
+{% set php_upstream = item.php_upstream %}
+{% else %}
+{% set php_info = 'Warning: using first PHP version on config' %}
+{% set php_upstream = nginx_php.0.upstream_name | default(nginx_php.0.version | php_default_upstream_name) %}
+{% endif %}
+
 {% block template_index %}
 	index {{ item.index | default('index.html index.htm index.php') }};
 {% endblock %}
@@ -10,7 +21,8 @@
 
 {% block template_upstream_location %}
 	location ~ \.php$ {
-		fastcgi_pass {{ item.php_upstream }};
+		# {{ php_info }}
+		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}

templates/etc/nginx/sites-available/_php_index.j2

@@ -2,7 +2,8 @@
 
 {% block template_upstream_location %}
 	location = /index.php {
-		fastcgi_pass {{ item.php_upstream }};
+		# {{ php_info }}
+		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}

templates/etc/nginx/sites-available/_php_index2.j2

@@ -6,7 +6,8 @@
 
 {% block template_upstream_location %}
 	location = /index.php {
-		fastcgi_pass {{ item.php_upstream }};
+		# {{ php_info }}
+		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}

templates/etc/nginx/sites-available/_symfony.j2

@@ -1,27 +0,0 @@
-{% extends "_php.j2" %}
-
-{% block template_try_files %}
-		 try_files $uri /index.php$is_args$args;
-{% endblock %}
-
-{% block template_upstream_location %}
-	location /bundles {
-		try_files $uri =404;
-	}
-
-	location ~ ^/index\.php(/|$) {
-		fastcgi_pass {{ item.php_upstream }};
-		fastcgi_index index.php;
-{% if item.upstream_params is defined and item.upstream_params is iterable %}
-{% for param in item.upstream_params %}
-		{{ param }}
-{% endfor %}
-{% endif %}
-		include fastcgi.conf;
-		internal;
-	}
-
-	location ~ \.php$ {
-		return 404;
-	}
-{% endblock %}

tests/group_vars/all.yml

@@ -1,252 +0,0 @@
----
-
-# Internal vars
-int_ansible_ssl_dir: '/etc/ansible-ssl'
-# Role vars
-nginx_worker_processes: 1    # Ansible+FreeBSD can't detect CPU number
-nginx_apt_package: 'nginx-extras'
-nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
-nginx_custom_core:
-  - 'worker_rlimit_nofile 4242;'
-
-nginx_upstreams:
-  - name: 'test'
-    servers:
-      - path: '127.0.0.1:80'
-        max_conns: 150
-        weight: 10
-        down: false
-  - name: 'test-absent'
-    servers:
-      - path: '127.0.0.1:80'
-        max_conns: 150
-        weight: 10
-        down: false
-    state: 'absent'
-
-nginx_htpasswd:
-  - name: 'hello'
-    description: 'Please login!'
-    users:
-      - name: 'hx'
-        password: 'asdfg'
-        state: 'absent'
-      - name: 'hanx'
-        password: 'qwerty'
-  - name: 'deleteme'
-    description: 'Please login!'
-    users: []
-    state: 'absent'
-
-nginx_acmesh: true
-nginx_acmesh_test: true
-
-nginx_ssl_pairs:
-  - name: '{{ ngrok.stdout }}'
-    acme: true
-  - name: 'test-ssl-selfsigned.local'
-    self_signed: true
-    force: false
-  - name:
-      - 'test-ssl-predeployed.local'
-      - 'test-multiple-name.local'    # Hack: tests for acme with multiple name, without using acme
-    dest_key: "{{ int_ansible_ssl_dir }}/test.key"
-    dest_cert: "{{ int_ansible_ssl_dir }}/test.crt"
-  - name: 'test-ssl.local'
-    key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEpAIBAAKCAQEAvavrJWFp3Al2VwRgKx+4Y2mbRRvoxvyd2pyN0xMJ/tCJscaG
-      8s60v6WZ9FcCOeMkSI2DXsk4z7pbQdQn0h2GDr/5MOJkPAVWSWEN46tpaLZ3v0zp
-      88ZIbnEk1G0PsdFuW/pnLsakPlAMrl1VArFsV6YsatLt30UIYYcRO97StkoOehCx
-      A5w+XqtfHZeQZ0/DS81633gwYUcMuSTUFZ60r7ge1/m77DTSKg3rTVk5sebP8cjS
-      +aWHvxP/GyvvDsT+3gjRJx2/5O3JkfH0zaOsaU2Avj0PR0c5rhynrNO/l1k+GJJB
-      cbBrM+yA8Ofzp4oXUrCfaIq3RuL3Pd+khcKsiwIDAQABAoIBAQCPpAMQ7BUfbosQ
-      m1+5SOx7XR8Z12kSSX3CcY12rJSFRakB2TeZ6rE38lIFmV82N67iw0kaH4nGx3sU
-      /3aoyXMc+IXfX5RJYEFYkQfTw5ywkH9fgQAsfZ2dBlK+DVo1cEYDoj9CTW1VQ4pX
-      Ape+0l8agd5hiBxdWgpe0ctbbARnx584viLiA/iPBDNxKi9zEYw+WP7hSj5QWahr
-      a09tubcC4L6tjvv8CoZTRSKfCW64vWRDvE6vmA+zJN9Arc1WTYzF1KO1Gybwf8h7
-      stJb191smAgGDFhKo0j58ncyAnrS1k4mapm86QQhlfIA6DKvvC0qm3KdQns5b7HM
-      PyzW0hwBAoGBAO2mTVTOsziom9vtBwM0nRMMEgynR2X3EKMJz2mjcCf66f1F+aQ5
-      DvQFM2V8S2s1nGnPh8NKKZ8DxW1NKuR4qx82zeAXpUs9ibHxOnw4YRC485zqc2Wt
-      fSO1OEDYeKyzWP1nGGtCntYUXzJnWn/wz0mBGKzLKTuLwyFIKx1b7bybAoGBAMxR
-      N+lT57rX6d4GUqcgNOuWMZ/D8egnE5+hsoiFnHOisRLOgUgBBSy4rwAZx+rdHYT+
-      RO11L1PLYEzyvnO0f13R+N7aqKwNXDSzZGA+jb4pjkVidIC2smG/JYKJH5Z+kakw
-      mwMKP0wdRZJsCaMgScHmWJS8d6Ox/XJJoWrTWTbRAoGAWJlEgVaiaIArwz1F/QLz
-      gHNik0cWDkSi9jWlFxwwpycbbypUXM5M7dq2g6JoN6sACk6trbgLdlYgl5RKZm06
-      VuPGs0H9hOSHXkix5jfasDJT2G9r4D9ixRo9w6cwriobBjYWW3612tgzeYYgrkwn
-      655uhZUkZSfA8rqGIGbyZfsCgYAf5WH8G+wmIATTc1s92epJCOZwUY+XNVp75itP
-      4sPczX4lOHW4PuiG5cH0GxI5mRE9rNAn3c5on2xGNvMCbyAfDmNyruH8Eg3d8E9w
-      MvO/xw79x/P2EA9i8QszCKMUxGeK6RqZ6+SbxkoRJKqQe77n9UTI228179hoGhSH
-      77ySsQKBgQC8SSZn6a8PpSIIFXB9WCFMwfGFYbUz0wvpaeZP8GKx3BEzMeJqSUaJ
-      hrQgpwQXkueeamlCQcvV3AUCoBRWTYRLDrWiUIXuIgikDWBFp6TBvTnVRI7iktly
-      fNED7jXOSjJqnFmdkZlAI5V8dM++mVYVykJD6jcaVRQvxqFLrhSaRg==
-      -----END RSA PRIVATE KEY-----
-    cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIDBTCCAe2gAwIBAgIJALKJfbk5vuieMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-      BAMMDnRlc3Qtc3NsLmxvY2FsMB4XDTE2MDExMTE2NDI0NFoXDTI2MDEwODE2NDI0
-      NFowGTEXMBUGA1UEAwwOdGVzdC1zc2wubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUA
-      A4IBDwAwggEKAoIBAQC9q+slYWncCXZXBGArH7hjaZtFG+jG/J3anI3TEwn+0Imx
-      xobyzrS/pZn0VwI54yRIjYNeyTjPultB1CfSHYYOv/kw4mQ8BVZJYQ3jq2lotne/
-      TOnzxkhucSTUbQ+x0W5b+mcuxqQ+UAyuXVUCsWxXpixq0u3fRQhhhxE73tK2Sg56
-      ELEDnD5eq18dl5BnT8NLzXrfeDBhRwy5JNQVnrSvuB7X+bvsNNIqDetNWTmx5s/x
-      yNL5pYe/E/8bK+8OxP7eCNEnHb/k7cmR8fTNo6xpTYC+PQ9HRzmuHKes07+XWT4Y
-      kkFxsGsz7IDw5/OnihdSsJ9oirdG4vc936SFwqyLAgMBAAGjUDBOMB0GA1UdDgQW
-      BBRaSF1L+ivPhmIVGQjtviBqZWDS9DAfBgNVHSMEGDAWgBRaSF1L+ivPhmIVGQjt
-      viBqZWDS9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjrgB9+Zuq
-      Rx7T2mRUl4jf75dLabuBQD0ePALTtvNyBSghhzSr90mE7GlFOYAv0JsmEa3R1LVF
-      wLPIdrIhNHpt7hN0PkhUlfgmxBnRSCfhpiq4xxsDVFM7ehtDz4+dv1LUDMXo07+E
-      f24g9aqmypiFzHisUQrYIhtQmHxRpKyGp6kDAW9qNxg6k/Um00aHdYfuD9ER4ksR
-      f8Hto7f+vssKxCRY2OZXqq13PxEwC5+hgAUkTdrycA/moXFuHJi3lCnCND7sSzvG
-      tXBggOusyFZFC4bs2m+V+Z+RN+tK2c/c0nq5HR8MV5HwIm4Z8GoT2/0BfJ00cgWL
-      lVz0gDBfdH8f
-      -----END CERTIFICATE-----
-
-nginx_custom_http:
-  - 'add_header X-ansible 1;'
-  - 'geoip_country {% if ansible_os_family == "Debian" %}/usr/share/GeoIP/GeoIP.dat{% else %}/usr/local/share/GeoIP/GeoIP.dat{% endif %};'
-  - 'map $geoip_country_code $allowed_country {'
-  - '    default yes;'
-  - '    MA no;'
-  - '    DZ no;'
-  - '    TN no;'
-  - '}'
-
-nginx_default_site: 'test.local'
-nginx_default_site_ssl: 'test-ssl-predeployed.local'
-
-nginx_sites:
-  - name:
-      - 'test.local'
-      - 'test-alias.local'
-      - 'test2-alias.local'
-    template: '_base'
-    filename: 'first-test'
-    override_try_files: '$uri/ $uri =404'
-    headers:
-      'X-Frame-Options': 'deny always'
-      'X-ansible-default': '1'
-    manage_local_content: false
-    use_error_log: true
-    more:
-      - 'autoindex off;'
-    location:
-      '/test':
-        - 'return 403;'
-      '/gunther':
-        - 'return 404;'
-      '/status':
-        - 'stub_status on;'
-        - 'access_log off;'
-        - 'allow 127.0.0.1;'
-        - 'deny all;'
-  - name: 'test-htpasswd.local'
-    template: '_base'
-    location_before:
-      '/hello':
-        - htpasswd: 'hello'
-    location:
-      '/public':
-        - htpasswd: false
-    use_error_log: true
-  - name: 'test-htpasswd-all.local'
-    template: '_base'
-    htpasswd: 'hello'
-  - name: 'test-location.local'
-    template: '_base'
-    location_before:
-      '/b':
-        - 'alias /var/tmp;'
-      '/c':
-        - 'alias /var/tmp;'
-    location:
-      '/':
-        - 'alias /var/tmp;'
-      '/a':
-        - 'alias /var/tmp;'
-    location_order_before:
-      - '/b'
-      - '/c'
-    location_order:
-      - '/'
-      - '/a'
-  - name: 'test-php.local'
-    php_upstream: "manual"
-    upstream_params:
-      - 'fastcgi_param FOO bar;'
-    redirect_from:
-      - 'www.test-php.local'
-    template: '_php'
-    use_error_log: true
-    use_access_log: true
-  - name: 'test-php-index.local'
-    template: '_php_index'
-    php_upstream: 'hx_unix'
-  - name: 'test-php-index2.local'
-    template: '_php_index2'
-    php_upstream: 'hx_ip'
-  - name: 'test-proxy.local'
-    listen:
-      - 8080
-    template: '_proxy'
-    upstream_name: 'test'
-    headers:
-      'X-proxyfied': '1'
-  - name: 'deleted.local'
-    state: 'absent'
-  - name: 'redirect-to.local'
-    redirect_to: 'http://test.local'
-  - name: 'test-ssl.local'
-    proto: ['http', 'https']
-    template: '_base'
-  - name:
-      - 'test-ssl-selfsigned.local'
-      - 'www.test-ssl-selfsigned.local'
-    proto: ['http', 'https']
-    template: '_base'
-    hsts: 'max-age=1664;'
-  - name: 'test-ssl-predeployed.local'
-    proto: ['http', 'https']
-    template: '_base'
-    ssl_name: 'test-ssl-predeployed.local'
-    headers:
-      'X-ansible-default': '1'
-    ssl_template: false
-  - name: 'test-ssl-redirect.local'
-    proto: ['https']
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    redirect_https: true
-  - name:
-      - 'test-ssl-redirect-many.local'
-      - 'test-ssl-redirect-many2.local'
-    listen_ssl: [8443]
-    proto: ['https']
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    redirect_https: true
-    redirect_from:
-      - 'www.test-ssl-redirect-many.local'
-      - 'www.test-ssl-redirect-many2.local'
-  - name: 'test-ssl-proxy-protocol.local'
-    proto: ['http', 'https']
-    listen_proxy_protocol: [20080]
-    listen_proxy_protocol_ssl: [20443]
-    template: '_base'
-    ssl_name: 'test-ssl.local'
-    headers:
-      'X-Proxy-Protocol': '1'
-  - name: '{{ ngrok.stdout }}'
-    proto: ['http', 'https']
-    listen_proxy_protocol: [21080]
-    listen_proxy_protocol_ssl: [21443]
-    template: '_base'
-    ssl_name: '{{ ngrok.stdout }}'
-    headers:
-      'X-acme': '1'
-  - name: 'test-custom-template.local'
-    custom_template: 'templates/custom_template.conf.j2'
-    root: '/tmp/custom-template'
-
-nginx_php: "{{ [{'upstream_name': 'manual', 'sockets': [{'host': '127.0.0.1', 'port': '9636'}]}] }}"
-nginx_dh_length: 1024

tests/includes/post_Debian.yml

@@ -1 +1,19 @@
 ---
+
+- name: APT | Install webapps and related tools
+  apt:
+    pkg: "{{ packages }}"
+    state: present
+    install_recommends: no
+  vars:
+    packages:
+      - backuppc
+      - samba-common-bin
+      - smbclient
+
+- name: SERVICE | Ensure backuppc is started
+  service:
+    name: backuppc
+    state: started
+  register: b
+  failed_when: b.failed and 'Another BackupPC is running' not in b.msg

tests/includes/post_FreeBSD.yml

@@ -1 +1,23 @@
 ---
+
+#- name: APT | Install web apps
+#  pkgng:
+#    name: "backuppc"
+#    state: present
+#
+#- name: COMMAND | Activate backuppc config
+#  command: >
+#    cp /usr/local/etc/backuppc/config.pl.sample /usr/local/etc/backuppc/config.pl
+#    creates=/usr/local/etc/backuppc/config.pl
+#
+#- name: FILE | Fix backuppc permissions
+#  file:
+#    path: /usr/local/etc/backuppc/config.pl
+#    owner: backuppc
+#    group: backuppc
+#
+#
+# We don't manage BackupPC on FreeBSD... too dirty. :/
+#
+#- name: SERVICE | Ensure backuppc is started
+#  service: name=backuppc state=started enabled=yes

tests/includes/post_common.yml

@@ -1,262 +0,0 @@
----
-
-# --------------------------------
-# Deploy index files
-# --------------------------------
-- name: -- Add PHP file --
-  ansible.builtin.copy:
-    dest: "{{ nginx_root }}/{{ item }}/public/index.php"
-    content: "<?php phpinfo();"
-    mode: 0644
-    owner: root
-    group: root
-  loop:
-    - 'test-php.local'
-    - 'test-php-index.local'
-    - 'test-php-index2.local'
-
-- name: -- Add Directories --
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0755
-  loop:
-    - "{{ nginx_root }}/test-htpasswd.local/public/hello"
-    - "/tmp/custom-template"
-
-- name: -- Add HTML file --
-  ansible.builtin.copy:
-    dest: "{{ item }}/index.html"
-    content: "Index HTML test OK\n"
-    mode: 0644
-    owner: root
-    group: root
-  loop:
-    - '{{ nginx_root }}/first-test/public'
-    - '/var/tmp'
-    - '{{ nginx_root }}/test-htpasswd-all.local/public'
-    - '{{ nginx_root }}/test-ssl.local/public'
-    - '{{ nginx_root }}/test-ssl-selfsigned.local/public'
-    - '{{ nginx_root }}/test-ssl-predeployed.local/public'
-    - '{{ nginx_root }}/test-ssl-proxy-protocol.local/public'
-    - '{{ nginx_root }}/{{ ngrok.stdout }}/public'
-
-- name: -- Create directory --
-  ansible.builtin.file:
-    path: "{{ nginx_root }}/test-htpasswd.local/public/hello"
-    state: directory
-    mode: 0755
-    owner: root
-    group: root
-
-- name: -- Add HTML file hello --
-  ansible.builtin.copy:
-    dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html"
-    content: "hello\n"
-    mode: 0644
-    owner: root
-    group: root
-
-# --------------------------------
-# Test custom facts
-# --------------------------------
-- name: -- CHECK FACTS --
-  ansible.builtin.assert:
-    that: "'{{ ansible_local.nginx.fact_nginx_sites[0].name[0] }}' == 'test.local'"
-
-# --------------------------------
-# Simple sites tests
-# --------------------------------
-- name: -- VERIFY SITES --
-  ansible.builtin.uri:
-    url: "http://{{ item | nginx_site_name }}{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
-    status_code: '200,301,302,401,403'
-    follow_redirects: none
-  loop: "{{ nginx_sites }}"
-  when: item.state is undefined or item.state != "absent"
-  changed_when: false
-
-- name: -- VERIFY FORBIDDEN --
-  ansible.builtin.uri:
-    url: "http://test-php-index.local/phpinfo.php"
-    status_code: 403
-
-- name: -- VERIFY REDIRECT SITES --
-  ansible.builtin.uri:
-    url: "http://{{ item.redirect_from[0] }}/"
-    status_code: 301
-    follow_redirects: none
-  loop: "{{ nginx_sites }}"
-  when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and (item.proto is not defined or 'https' not in item.proto)
-  changed_when: false
-
-- name: -- VERIFY REDIRECT HTTPS SITES --
-  ansible.builtin.uri:
-    url: "https://{{ item.redirect_from[0] }}:{{ item.listen_ssl[0] | default(443) }}/"
-    status_code: 301
-    follow_redirects: none
-    validate_certs: false
-  loop: "{{ nginx_sites }}"
-  when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and item.proto is defined and 'https' in item.proto
-  changed_when: false
-
-# --------------------------------
-# PHP
-# --------------------------------
-- name: -- VERIFY PHP SITES --
-  ansible.builtin.uri:
-    url: "http://{{ item.name }}/"
-    return_content: true
-  register: p
-  loop: "{{ nginx_sites }}"
-  when: >
-    item.template is defined and
-    (item.template == '_php' or item.template == '_php_index' or item.template == '_php_index2')
-  failed_when: p.content.find('PHP Version') == -1
-
-- name: -- VERIFY INDEX2 --
-  ansible.builtin.uri:
-    url: "http://test-php-index2.local/lorem.php?ipsum=sit&dolor=amet"
-    return_content: true
-  register: p2
-  failed_when: p2.content.find('PHP Version') == -1
-
-# --------------------------------
-# Basic Auth
-# --------------------------------
-- name: -- VERIFY AUTH BASIC NONE --
-  ansible.builtin.uri:
-    url: "http://test-htpasswd.local/hello/"
-    status_code: 401
-
-- name: -- VERIFY AUTH BASIC FAIL --
-  ansible.builtin.uri:
-    url: "http://test-htpasswd.local/hello/"
-    status_code: 401
-    user: "fail"
-    password: "fail"
-    force_basic_auth: true
-
-- name: -- VERIFY AUTH BASIC OK --
-  ansible.builtin.uri:
-    url: "http://test-htpasswd.local/hello/"
-    user: "hanx"
-    password: "qwerty"
-    force_basic_auth: true
-
-- name: -- VERIFY AUTH BASIC FAIL GLOBAL --
-  ansible.builtin.uri:
-    url: "http://test-htpasswd-all.local/"
-    status_code: 401
-    user: "fail"
-    password: "fail"
-    force_basic_auth: true
-
-- name: -- VERIFY AUTH BASIC OK GLOBAL --
-  ansible.builtin.uri:
-    url: "http://test-htpasswd-all.local/"
-    user: "hanx"
-    password: "qwerty"
-    force_basic_auth: true
-
-# --------------------------------
-# SSL
-# --------------------------------
-- name: -- VERIFY SSL --
-  ansible.builtin.uri:
-    url: "https://{{ item }}/"
-    return_content: true
-    validate_certs: false
-  register: sslok
-  failed_when: sslok.content.find('Index HTML test OK') == -1
-  loop:
-    - 'test-ssl-predeployed.local'
-    - 'test-ssl-selfsigned.local'
-    - 'test-ssl.local'
-    - '{{ ngrok.stdout }}'
-
-- name: -- VERIFY SSL REDIRECT --
-  ansible.builtin.uri:
-    url: "http://{{ item.name }}/"
-    validate_certs: false
-    status_code: 301
-    return_content: true
-    follow_redirects: none
-  register: sslredirok
-  failed_when: '"https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.location'
-  loop:
-    - name: 'test-ssl-redirect.local'
-    - name: 'test-ssl-redirect-many.local'
-      port: '8443'
-    - name: 'test-ssl-redirect-many2.local'
-      port: '8443'
-
-# --------------------------------
-# Default sites
-# --------------------------------
-- name: -- VERIFY DEFAULT SITE --
-  ansible.builtin.uri:
-    url: 'http://127.0.0.1/'
-    return_content: true
-  register: vdefault
-  failed_when: >
-    vdefault.content.find('Index HTML test OK') == -1 or
-    vdefault.x_ansible_default is not defined
-
-- name: -- VERIFY DEFAULT SITE + STUB STATUS--
-  ansible.builtin.uri:
-    url: 'http://127.0.0.1/status'
-    return_content: true
-  register: vdefault_status
-  failed_when: >
-    vdefault_status.content.find('Active connections') == -1 or
-    vdefault_status.x_ansible_default is not defined
-
-- name: -- VERIFY DEFAULT SSL SITE --
-  ansible.builtin.uri:
-    url: 'https://127.0.0.1/'
-    return_content: true
-    validate_certs: false
-  register: vdefault
-  failed_when: >
-    vdefault.content.find('Index HTML test OK') == -1 or
-    vdefault.x_ansible_default is not defined
-
-- name: -- VERIFY NOT DEFAULT SITE --
-  ansible.builtin.uri:
-    url: 'http://test-php.local/'
-    return_content: true
-  register: vphp
-  failed_when: vphp.x_ansible_default is defined
-
-- name: -- VERIFY NOT DEFAULT SSL SITE --
-  ansible.builtin.uri:
-    url: 'https://test-ssl.local/'
-    return_content: true
-    validate_certs: false
-  register: notdefaultssl
-  failed_when: notdefaultssl.x_ansible_default is defined
-
-# --------------------------------
-# Check Proxy protocol
-# --------------------------------
-- name: SHELL | Check HTTP proxy protocol
-  ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
-  args:
-    executable: /bin/bash
-  changed_when: false
-
-- name: SHELL | Check HTTPS proxy protocol
-  ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
-  args:
-    executable: /bin/bash
-  changed_when: false
-
-# --------------------------------
-# Check HTTP2
-# --------------------------------
-- name: SHELL | Check HTTP2
-  ansible.builtin.shell: set -o pipefail && nghttp -nv https://localhost 2> /dev/null | grep -q h2
-  args:
-    executable: /bin/bash
-  changed_when: false

tests/includes/pre_Debian.yml

@@ -1,15 +1,33 @@
 ---
 
 - name: APT_REPOSITORY | Install backports
-  ansible.builtin.apt_repository:
+  apt_repository:
     repo: 'deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main'
     state: present
-  when: nginx_backports is defined and nginx_backports
+  when: nginx_backports
+
+- block:
+
+  - name: APT | Install apt-transport-https
+    apt:
+      pkg: apt-transport-https
+      update_cache: yes
+      cache_valid_time: 3600
+
+  - name: APT_KEY | Install GPG key
+    apt_key:
+      url: 'https://packages.sury.org/php/apt.gpg'
+
+  - name: APT_REPOSITORY | Add APT repository
+    apt_repository:
+      repo: 'deb https://packages.sury.org/php {{ ansible_distribution_release }} main'
+
+  when: sury | default(false)
 
 - name: APT | Install needed packages
-  ansible.builtin.apt:
+  apt:
     pkg: "{{ packages }}"
-    update_cache: true
+    update_cache: yes
     cache_valid_time: 3600
     state: present
   vars:
@@ -17,6 +35,7 @@
       - cron
       - curl
       - daemonize
+      - fcgiwrap
       - jq
       - nghttp2
       - strace
@@ -24,59 +43,38 @@
       - unzip
 
 - name: APT | Install PHP
-  ansible.builtin.apt:
+  apt:
-    pkg: "{{ pkgs }}"
+    pkg: "{{ item.version | php_fpm_package }}"
-    update_cache: true
+    update_cache: yes
     cache_valid_time: 3600
     state: present
-  vars:
+  loop: "{{ nginx_php }}"
-    pkgs:
+  register: apt_php
-      - php-cli
-      - php-fpm
 
-- name: SHELL | Get current PHP version
+- name: SERVICE | Force start fcgiwrap
-  ansible.builtin.shell: php --version | awk '/^PHP/ { print $2 }' | grep -o -E '^.{3}'
+  service:
-  changed_when: false
+    name: "fcgiwrap"
-  register: cur_php_version
+    state: started
 
 # Bypasses Ansible+Docker issue. With service module... php is not really started!
 - name: COMMAND | Force start PHP
-  ansible.builtin.command: "service php{{ cur_php_version.stdout }}-fpm start"
+  command: "service {{ item.version | php_fpm_service }} start"
   args:
-    creates: "/run/php/php{{ cur_php_version.stdout }}-fpm.pid"
+    creates: "{{ item.version | php_default_upstream_socket }}"
+    warn: false
+  loop: "{{ nginx_php }}"
 
 - name: GET_URL | Download ngrok
-  ansible.builtin.get_url:
+  get_url:
-    url: "https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz"
+    url: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip"
     dest: "/tmp/ngrok.zip"
 
 - name: UNARCHIVE | Uncompress ngrok
-  ansible.builtin.unarchive:
+  unarchive:
     src: "/tmp/ngrok.zip"
     dest: "/tmp"
-    remote_src: true
+    remote_src: yes
 
 - name: SET_FACT | ngrok_path
-  ansible.builtin.set_fact:
+  set_fact:
     ngrok_path: '/tmp/ngrok'
-
-- name: USER | Create PHP User foo
-  ansible.builtin.user:
-    name: foo
-    system: true
-
-- name: INCLUDE_ROLE | hanxhx.php  # TODO: repair vagrant
-  ansible.builtin.include_role:
-    name: "hanxhx.php"
-  vars:
-    php_version: "{{ cur_php_version.stdout }}"
-    php_autoremove_default_pool: false
-    php_fpm_poold:
-      - name: 'hx_unix'
-        user: 'foo'
-        php_value:
-          display_errors: 'Off'
-        php_admin_value:
-          memory_limit: '98M'
-      - name: 'hx_ip'
-        listen: '127.0.0.1:9636'

tests/includes/pre_FreeBSD.yml

@@ -5,18 +5,12 @@
     nginx_pkgng_package: 'nginx-full'
     nginx_user: 'www'
     nginx_php:
-      - upstream_name: 'manual'
+      - version: '7.2'
-        sockets:
-          - host: '127.0.0.1'
-            port: 9000
-      - upstream_name: 'hx_unix'
-        sockets:
-          - host: '127.0.0.1'
-            port: 9000
-      - upstream_name: 'hx_ip'
         sockets:
           - host: '127.0.0.1'
             port: 9000
+    nginx_load_modules:
+      - /usr/local/libexec/nginx/ngx_http_geoip_module.so
     ngrok_path: '/usr/local/bin/ngrok'
 
 - name: PKGNG | Install needed packages
@@ -25,23 +19,29 @@
     state: present
   vars:
     packages:
-      - bash
       - curl
       - daemonize
       - fcgiwrap
+      - GeoIP
       - jq
       - nghttp2
-      - php74
+      - php72
       - vim
 
+- name: COMMAND | Get geoip database
+  command: geoipupdate.sh
+  args:
+    creates: /usr/local/share/GeoIP/GeoIP.dat
+
 - name: SERVICE | Force start services
   service:
     name: "{{ item }}"
     state: started
-    enabled: true
+    enabled: yes
   register: sf
   loop:
     - php-fpm
+    - fcgiwrap
 
 - name: STAT | Check ports
   stat:

tests/includes/pre_common.yml

@@ -1,59 +1,29 @@
 ---
 
-- name: COMMAND | Start ngrok
+- name: SHELL | Start ngrok
-  ansible.builtin.command: daemonize -l /tmp/ngrok.lock {{ ngrok_path }} http 80 --scheme http
+  shell: daemonize -l /tmp/ngrok.lock {{ ngrok_path }} http 8888 -bind-tls=false
   failed_when: false
   changed_when: ngrok.stderr.find("Can't lock the lock file") == -1
   register: ngrok
 
-- name: WAIT_FOR | ngrok started  # noqa: no-handler
+- name: WAIT_FOR | ngrok started
-  ansible.builtin.wait_for:
+  wait_for:
     delay: 2
     port: 4040
   when: ngrok.changed
 
 - name: SHELL | Get ngrok public address
-  ansible.builtin.shell: set -o pipefail && curl 'http://127.0.0.1:4040/api/tunnels/command_line' 2> /dev/null | jq -r '.public_url' | cut -d '/' -f 3
+  shell: curl 'http://127.0.0.1:4040/api/tunnels/command_line' | jq '.public_url' | grep -oE '[[:alnum:]]+\.ngrok\.io'
   args:
-    executable: /bin/bash
+    warn: false
   register: ngrok
   changed_when: false
 
-- name: FILE | Create an internal SSL dir
+- name: LINEINFILE | Tune vimrc
-  ansible.builtin.file:
+  lineinfile:
-    path: "{{ int_ansible_ssl_dir }}"
+    line: "set mouse="
-    state: directory
+    dest: "{{ item }}/.vimrc"
-    mode: 0750
+    create: yes
-    owner: root
-    group: root
-
-- name: COPY | Deploy test cert/key
-  ansible.builtin.copy:
-    src: "file/{{ item }}"
-    dest: "{{ int_ansible_ssl_dir }}/{{ item }}"
-    mode: 0640
-    owner: root
-    group: root
   loop:
-    - 'test.key'
+    - /root
-    - 'test.crt'
+    - /home/vagrant
-
-- name: COPY | Add all hosts in /etc/hosts
-  ansible.builtin.copy:
-    content: |
-      127.0.0.1 localhost
-      {% for s in nginx_sites %}
-      {% if s.name is string %}
-      127.0.0.1 {{ s.name }}
-      {% else %}
-      127.0.0.1 {% for n in s.name %}{{ n }} {% endfor %}
-      {% endif %}
-      {% if s.redirect_from is defined %}
-      127.0.0.1 {% for rf in s.redirect_from %}{{ rf }} {% endfor %}
-      {% endif %}
-      {% endfor %}
-    dest: "/etc/hosts"
-    mode: 0644
-    owner: root
-    group: root
-    unsafe_writes: true

tests/templates/custom_template.conf.j2

@@ -1,16 +0,0 @@
-# {{ ansible_managed }} - custom template
-
-server {
-	listen 80;
-	listen 8888 http2;
-	listen 9999 http2 proxy_protocol;
-	server_name {{ item.name }};
-
-	index index.html index.htm;
-
-	root {{ item.root }};
-
-	location / {
-		try_files $uri $uri/ =404;
-	}
-}

tests/test.yml

@@ -1,20 +1,524 @@
 ---
 
-- name: Launch tests  # noqa: role-name[path]
+- hosts: all
-  hosts: all
   pre_tasks:
     - name: INCLUDE_TASKS | Pre_tasks related to OS version
-      ansible.builtin.include_tasks: "includes/pre_{{ ansible_os_family }}.yml"
+      include_tasks: "includes/pre_{{ ansible_distribution }}.yml"
 
     - name: IMPORT_TASKS | Pre_tasks common
-      ansible.builtin.import_tasks: "includes/pre_common.yml"
+      import_tasks: "includes/pre_common.yml"
 
+    - name: FILE | Create an internal SSL dir
+      file:
+        path: "{{ int_ansible_ssl_dir }}"
+        state: directory
+
+    - name: COPY | Deploy test certificate
+      copy:
+        src: "file/test.crt"
+        dest: "{{ int_ansible_ssl_dir }}/test.crt"
+
+    - name: COPY | Deploy test key
+      copy:
+        src: "file/test.key"
+        dest: "{{ int_ansible_ssl_dir }}/test.key"
+
+    - name: COPY | Add all hosts in /etc/hosts
+      copy:
+        content: |
+          127.0.0.1 localhost
+          {% for s in nginx_sites %}
+          {% if s.name is string %}
+          127.0.0.1 {{ s.name }}
+          {% else %}
+          127.0.0.1 {% for n in s.name %}{{ n }} {% endfor %}
+          {% endif %}
+          {% if s.redirect_from is defined %}
+          127.0.0.1 {% for rf in s.redirect_from %}{{ rf }} {% endfor %}
+          {% endif %}
+          {% endfor %}
+        dest: "/etc/hosts"
+        unsafe_writes: yes
+
+  vars:
+# Internal vars
+    int_ansible_ssl_dir: '/etc/ansible-ssl'
+# Role vars
+    nginx_worker_processes: 1 # Ansible+FreeBSD can't detect CPU number
+    nginx_apt_package: 'nginx-extras'
+    nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
+    nginx_upstreams:
+      - name: 'test'
+        servers:
+          - path: '127.0.0.1:80'
+            max_conns: 150
+            weight: 10
+            down: false
+      - name: 'test-absent'
+        servers:
+          - path: '127.0.0.1:80'
+            max_conns: 150
+            weight: 10
+            down: false
+        state: 'absent'
+    nginx_htpasswd:
+      - name: 'hello'
+        description: 'Please login!'
+        users:
+          - name: 'hx'
+            password: 'asdfg'
+            state: 'absent'
+          - name: 'hanx'
+            password: 'qwerty'
+      - name: 'deleteme'
+        description: 'Please login!'
+        users: []
+        state: 'absent'
+    nginx_acmesh: true
+    nginx_acmesh_test: true
+    nginx_ssl_pairs:
+      - name:
+          - '{{ ngrok.stdout }}'
+        acme: true
+        acme_port: 8888
+      - name: 'test-ssl-selfsigned.local'
+        self_signed: true
+        force: false
+      - name: 'test-ssl-predeployed.local'
+        dest_key: "{{ int_ansible_ssl_dir }}/test.key"
+        dest_cert: "{{ int_ansible_ssl_dir }}/test.crt"
+      - name: 'test-ssl.local'
+        key: |
+          -----BEGIN RSA PRIVATE KEY-----
+          MIIEpAIBAAKCAQEAvavrJWFp3Al2VwRgKx+4Y2mbRRvoxvyd2pyN0xMJ/tCJscaG
+          8s60v6WZ9FcCOeMkSI2DXsk4z7pbQdQn0h2GDr/5MOJkPAVWSWEN46tpaLZ3v0zp
+          88ZIbnEk1G0PsdFuW/pnLsakPlAMrl1VArFsV6YsatLt30UIYYcRO97StkoOehCx
+          A5w+XqtfHZeQZ0/DS81633gwYUcMuSTUFZ60r7ge1/m77DTSKg3rTVk5sebP8cjS
+          +aWHvxP/GyvvDsT+3gjRJx2/5O3JkfH0zaOsaU2Avj0PR0c5rhynrNO/l1k+GJJB
+          cbBrM+yA8Ofzp4oXUrCfaIq3RuL3Pd+khcKsiwIDAQABAoIBAQCPpAMQ7BUfbosQ
+          m1+5SOx7XR8Z12kSSX3CcY12rJSFRakB2TeZ6rE38lIFmV82N67iw0kaH4nGx3sU
+          /3aoyXMc+IXfX5RJYEFYkQfTw5ywkH9fgQAsfZ2dBlK+DVo1cEYDoj9CTW1VQ4pX
+          Ape+0l8agd5hiBxdWgpe0ctbbARnx584viLiA/iPBDNxKi9zEYw+WP7hSj5QWahr
+          a09tubcC4L6tjvv8CoZTRSKfCW64vWRDvE6vmA+zJN9Arc1WTYzF1KO1Gybwf8h7
+          stJb191smAgGDFhKo0j58ncyAnrS1k4mapm86QQhlfIA6DKvvC0qm3KdQns5b7HM
+          PyzW0hwBAoGBAO2mTVTOsziom9vtBwM0nRMMEgynR2X3EKMJz2mjcCf66f1F+aQ5
+          DvQFM2V8S2s1nGnPh8NKKZ8DxW1NKuR4qx82zeAXpUs9ibHxOnw4YRC485zqc2Wt
+          fSO1OEDYeKyzWP1nGGtCntYUXzJnWn/wz0mBGKzLKTuLwyFIKx1b7bybAoGBAMxR
+          N+lT57rX6d4GUqcgNOuWMZ/D8egnE5+hsoiFnHOisRLOgUgBBSy4rwAZx+rdHYT+
+          RO11L1PLYEzyvnO0f13R+N7aqKwNXDSzZGA+jb4pjkVidIC2smG/JYKJH5Z+kakw
+          mwMKP0wdRZJsCaMgScHmWJS8d6Ox/XJJoWrTWTbRAoGAWJlEgVaiaIArwz1F/QLz
+          gHNik0cWDkSi9jWlFxwwpycbbypUXM5M7dq2g6JoN6sACk6trbgLdlYgl5RKZm06
+          VuPGs0H9hOSHXkix5jfasDJT2G9r4D9ixRo9w6cwriobBjYWW3612tgzeYYgrkwn
+          655uhZUkZSfA8rqGIGbyZfsCgYAf5WH8G+wmIATTc1s92epJCOZwUY+XNVp75itP
+          4sPczX4lOHW4PuiG5cH0GxI5mRE9rNAn3c5on2xGNvMCbyAfDmNyruH8Eg3d8E9w
+          MvO/xw79x/P2EA9i8QszCKMUxGeK6RqZ6+SbxkoRJKqQe77n9UTI228179hoGhSH
+          77ySsQKBgQC8SSZn6a8PpSIIFXB9WCFMwfGFYbUz0wvpaeZP8GKx3BEzMeJqSUaJ
+          hrQgpwQXkueeamlCQcvV3AUCoBRWTYRLDrWiUIXuIgikDWBFp6TBvTnVRI7iktly
+          fNED7jXOSjJqnFmdkZlAI5V8dM++mVYVykJD6jcaVRQvxqFLrhSaRg==
+          -----END RSA PRIVATE KEY-----
+        cert: |
+          -----BEGIN CERTIFICATE-----
+          MIIDBTCCAe2gAwIBAgIJALKJfbk5vuieMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+          BAMMDnRlc3Qtc3NsLmxvY2FsMB4XDTE2MDExMTE2NDI0NFoXDTI2MDEwODE2NDI0
+          NFowGTEXMBUGA1UEAwwOdGVzdC1zc2wubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUA
+          A4IBDwAwggEKAoIBAQC9q+slYWncCXZXBGArH7hjaZtFG+jG/J3anI3TEwn+0Imx
+          xobyzrS/pZn0VwI54yRIjYNeyTjPultB1CfSHYYOv/kw4mQ8BVZJYQ3jq2lotne/
+          TOnzxkhucSTUbQ+x0W5b+mcuxqQ+UAyuXVUCsWxXpixq0u3fRQhhhxE73tK2Sg56
+          ELEDnD5eq18dl5BnT8NLzXrfeDBhRwy5JNQVnrSvuB7X+bvsNNIqDetNWTmx5s/x
+          yNL5pYe/E/8bK+8OxP7eCNEnHb/k7cmR8fTNo6xpTYC+PQ9HRzmuHKes07+XWT4Y
+          kkFxsGsz7IDw5/OnihdSsJ9oirdG4vc936SFwqyLAgMBAAGjUDBOMB0GA1UdDgQW
+          BBRaSF1L+ivPhmIVGQjtviBqZWDS9DAfBgNVHSMEGDAWgBRaSF1L+ivPhmIVGQjt
+          viBqZWDS9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjrgB9+Zuq
+          Rx7T2mRUl4jf75dLabuBQD0ePALTtvNyBSghhzSr90mE7GlFOYAv0JsmEa3R1LVF
+          wLPIdrIhNHpt7hN0PkhUlfgmxBnRSCfhpiq4xxsDVFM7ehtDz4+dv1LUDMXo07+E
+          f24g9aqmypiFzHisUQrYIhtQmHxRpKyGp6kDAW9qNxg6k/Um00aHdYfuD9ER4ksR
+          f8Hto7f+vssKxCRY2OZXqq13PxEwC5+hgAUkTdrycA/moXFuHJi3lCnCND7sSzvG
+          tXBggOusyFZFC4bs2m+V+Z+RN+tK2c/c0nq5HR8MV5HwIm4Z8GoT2/0BfJ00cgWL
+          lVz0gDBfdH8f
+          -----END CERTIFICATE-----
+    nginx_custom_http:
+      - 'add_header X-ansible 1;'
+      - 'geoip_country {% if ansible_distribution == "Debian" %}/usr/share/GeoIP/GeoIP.dat{% else %}/usr/local/share/GeoIP/GeoIP.dat{% endif %};'
+      - 'map $geoip_country_code $allowed_country {'
+      - '    default yes;'
+      - '    MA no;'
+      - '    DZ no;'
+      - '    TN no;'
+      - '}'
+    nginx_default_site: 'first-test'
+    nginx_default_site_ssl: 'test-ssl-predeployed.local'
+    nginx_sites:
+      - name:
+          - 'test.local'
+          - 'test-alias.local'
+          - 'test2-alias.local'
+        template: '_base'
+        filename : 'first-test'
+        override_try_files: '$uri $uri /index.htm /index.html'
+        headers:
+          'X-Frame-Options': 'deny always'
+          'X-ansible-default': '1'
+        manage_local_content: false
+        use_error_log: true
+        more:
+          - 'autoindex off;'
+        location:
+          '/test':
+            - 'return 403;'
+          '/gunther':
+            - 'return 404;'
+          '/status':
+            - 'stub_status on;'
+            - 'access_log off;'
+            - 'allow 127.0.0.1;'
+            - 'deny all;'
+      - name: 'test-htpasswd.local'
+        template: '_base'
+        location_before:
+          '/hello':
+            - htpasswd: 'hello'
+        location:
+          '/public':
+            - htpasswd: false
+        use_error_log: true
+      - name: 'test-htpasswd-all.local'
+        template: '_base'
+        htpasswd: 'hello'
+      - name: 'test-location.local'
+        template: '_base'
+        location_before:
+          '/b':
+            - 'alias /var/tmp;'
+          '/c':
+            - 'alias /var/tmp;'
+        location:
+          '/':
+            - 'alias /var/tmp;'
+          '/a':
+            - 'alias /var/tmp;'
+        location_order_before:
+          - '/b'
+          - '/c'
+        location_order:
+          - '/'
+          - '/a'
+      - name: 'test-php.local'
+        php_version: "{{ nginx_php.1.version if nginx_php.1 is defined else nginx_php.0.version }}"
+        upstream_params:
+          - 'fastcgi_param FOO bar;'
+        redirect_from:
+          - 'www.test-php.local'
+        template: '_php'
+        use_error_log: true
+        use_access_log: true
+      - name: 'test-php-index.local'
+        template: '_php_index'
+      - name: 'test-php-index2.local'
+        template: '_php_index2'
+      - name: 'test-proxy.local'
+        listen:
+          - 8080
+        template: '_proxy'
+        upstream_name: 'test'
+        headers:
+          'X-proxyfied': '1'
+      - name: 'deleted.local'
+        state: 'absent'
+      - name: 'redirect-to.local'
+        redirect_to: 'http://test.local'
+      - name: 'backuppc.local'
+        template: '_backuppc'
+        htpasswd: 'hello'
+      - name: 'test-ssl.local'
+        proto: ['http', 'https']
+        template: '_base'
+      - name: 'test-ssl-selfsigned.local'
+        proto: ['http', 'https']
+        template: '_base'
+      - name: 'test-ssl-predeployed.local'
+        proto: ['http', 'https']
+        template: '_base'
+        ssl_name: 'test-ssl-predeployed.local'
+        headers:
+          'X-ansible-default': '1'
+        ssl_template: false
+      - name: 'test-ssl-redirect.local'
+        proto: ['https']
+        template: '_base'
+        ssl_name: 'test-ssl.local'
+        redirect_https: true
+      - name:
+          - 'test-ssl-redirect-many.local'
+          - 'test-ssl-redirect-many2.local'
+        listen_ssl: [8443]
+        proto: ['https']
+        template: '_base'
+        ssl_name: 'test-ssl.local'
+        redirect_https: true
+        redirect_from:
+          - 'www.test-ssl-redirect-many.local'
+          - 'www.test-ssl-redirect-many2.local'
+      - name: 'test-ssl-proxy-protocol.local'
+        proto: ['http', 'https']
+        listen: [80, 20080]
+        listen_ssl: [443, 20443]
+        http_proxy_protocol_port: [20080]
+        https_proxy_protocol_port: [20443]
+        template: '_base'
+        ssl_name: 'test-ssl.local'
+      - name: '{{ ngrok.stdout }}'
+        proto: ['http', 'https']
+        template: '_base'
+        ssl_name: '{{ ngrok.stdout }}'
+        headers:
+          'X-acme': '1'
+    nginx_dh_length: 1024
   roles:
     - ../../
-
   post_tasks:
+# --------------------------------
+# Apps
+# --------------------------------
     - name: INCLUDE_TASKS | Post_tasks related to OS version
-      ansible.builtin.include_tasks: "includes/post_{{ ansible_os_family }}.yml"
+      include_tasks: "includes/post_{{ ansible_distribution }}.yml"
 
-    - name: IMPORT_TASKS | Post_tasks common
+# --------------------------------
-      ansible.builtin.import_tasks: "includes/post_common.yml"
+# Deploy index files
+# --------------------------------
+    - name: -- Add PHP file --
+      copy:
+        dest: "{{ nginx_root }}/{{ item }}/public/index.php"
+        content: "<?php phpinfo();"
+      loop:
+        - 'test-php.local'
+        - 'test-php-index.local'
+        - 'test-php-index2.local'
+
+    - name: -- Add HTML file --
+      copy:
+        dest: "{{ item }}/index.html"
+        content: "Index HTML test OK\n"
+      loop:
+        - '{{ nginx_root }}/first-test/public'
+        - '/var/tmp'
+        - '{{ nginx_root }}/test-htpasswd-all.local/public'
+        - '{{ nginx_root }}/test-ssl.local/public'
+        - '{{ nginx_root }}/test-ssl-selfsigned.local/public'
+        - '{{ nginx_root }}/test-ssl-predeployed.local/public'
+        - '{{ nginx_root }}/test-ssl-proxy-protocol.local/public'
+        - '{{ nginx_root }}/{{ ngrok.stdout }}/public'
+
+    - name: -- Create directory --
+      file:
+        path: "{{ nginx_root }}/test-htpasswd.local/public/hello"
+        state: directory
+
+    - name: -- Add HTML file hello --
+      copy:
+        dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html"
+        content: "hello\n"
+
+# --------------------------------
+# Test custom facts
+# --------------------------------
+    - name: -- CHECK FACTS --
+      assert:
+        that: "'{{ ansible_local.nginx.fact_nginx_sites[0].name[0] }}' == 'test.local'"
+# --------------------------------
+# Simple sites tests
+# --------------------------------
+    - name: -- VERIFY SITES --
+      uri:
+        url: "http://{{ item | nginx_site_name }}{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
+        status_code: '200,301,302,401,403'
+        follow_redirects: none
+      loop: "{{ nginx_sites }}"
+      when: item.state is undefined or item.state != "absent"
+      changed_when: false
+
+    - name: -- VERIFY FORBIDDEN --
+      uri:
+        url: "http://test-php-index.local/phpinfo.php"
+        status_code: 403
+
+    - name: -- VERIFY REDIRECT SITES --
+      uri:
+        url: "http://{{ item.redirect_from[0] }}/"
+        status_code: 301
+        follow_redirects: none
+      loop: "{{ nginx_sites }}"
+      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and (item.proto is not defined or 'https' not in item.proto)
+      changed_when: false
+
+    - name: -- VERIFY REDIRECT HTTPS SITES --
+      uri:
+        url: "https://{{ item.redirect_from[0] }}:{{ item.listen_ssl[0] | default(443) }}/"
+        status_code: 301
+        follow_redirects: none
+        validate_certs: no
+      loop: "{{ nginx_sites }}"
+      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and item.proto is defined and 'https' in item.proto
+      changed_when: false
+
+# --------------------------------
+# PHP
+# --------------------------------
+    - name: -- VERIFY PHP SITES --
+      uri:
+        url: "http://{{ item.name }}/"
+        return_content: yes
+      register: p
+      loop: "{{ nginx_sites }}"
+      when: >
+        item.template is defined and
+        (item.template == '_php' or item.template == '_php_index' or item.template == '_php_index2')
+      failed_when: p.content.find('PHP Version ' + item.php_version if 'php_version' in item else nginx_php.0.version) == -1
+
+    - name: -- VERIFY INDEX2 --
+      uri:
+        url: "http://test-php-index2.local/lorem.php?ipsum=sit&dolor=amet"
+        return_content: yes
+      register: p2
+      failed_when: p2.content.find('PHP Version') == -1
+
+# --------------------------------
+# Basic Auth
+# --------------------------------
+    - name: -- VERIFY AUTH BASIC NONE --
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+
+    - name: -- VERIFY AUTH BASIC FAIL --
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+        user: "fail"
+        password: "fail"
+        force_basic_auth: yes
+
+    - name: -- VERIFY AUTH BASIC OK --
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+
+    - name: -- VERIFY AUTH BASIC FAIL GLOBAL --
+      uri:
+        url: "http://test-htpasswd-all.local/"
+        status_code: 401
+        user: "fail"
+        password: "fail"
+        force_basic_auth: yes
+
+    - name: -- VERIFY AUTH BASIC OK GLOBAL --
+      uri:
+        url: "http://test-htpasswd-all.local/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+
+# --------------------------------
+# BackupPC
+# --------------------------------
+    - name: -- VERIFY BACKUPPC --
+      uri:
+        url: "http://backuppc.local/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+        return_content: yes
+      register: authbpc
+      when: ansible_distribution != 'FreeBSD'
+      failed_when: authbpc.content.find('BackupPC Server Status') == -1
+
+# --------------------------------
+# SSL
+# --------------------------------
+    - name: -- VERIFY SSL --
+      uri:
+        url: "https://{{ item }}/"
+        return_content: yes
+        validate_certs: no
+      register: sslok
+      failed_when: sslok.content.find('Index HTML test OK') == -1
+      loop:
+        - 'test-ssl-predeployed.local'
+        - 'test-ssl-selfsigned.local'
+        - 'test-ssl.local'
+        - '{{ ngrok.stdout }}'
+
+    - name: -- VERIFY SSL REDIRECT --
+      uri:
+        url: "http://{{ item.name }}/"
+        validate_certs: no
+        status_code: 301
+        return_content: yes
+        follow_redirects: none
+      register: sslredirok
+      failed_when: '"https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.location'
+      loop:
+        - name: 'test-ssl-redirect.local'
+        - name: 'test-ssl-redirect-many.local'
+          port: '8443'
+        - name: 'test-ssl-redirect-many2.local'
+          port: '8443'
+
+# --------------------------------
+# Default sites
+# --------------------------------
+    - name: -- VERIFY DEFAULT SITE --
+      uri:
+        url: 'http://127.0.0.1/'
+        return_content: yes
+      register: vdefault
+      failed_when: >
+        vdefault.content.find('Index HTML test OK') == -1 or
+        vdefault.x_ansible_default is not defined
+
+    - name: -- VERIFY DEFAULT SITE + STUB STATUS--
+      uri:
+        url: 'http://127.0.0.1/status'
+        return_content: yes
+      register: vdefault_status
+      failed_when: >
+        vdefault_status.content.find('Active connections') == -1 or
+        vdefault_status.x_ansible_default is not defined
+
+    - name: -- VERIFY DEFAULT SSL SITE --
+      uri:
+        url: 'https://127.0.0.1/'
+        return_content: yes
+        validate_certs: no
+      register: vdefault
+      failed_when: >
+        vdefault.content.find('Index HTML test OK') == -1 or
+        vdefault.x_ansible_default is not defined
+
+    - name: -- VERIFY NOT DEFAULT SITE --
+      uri:
+        url: 'http://test-php.local/'
+        return_content: yes
+      register: vphp
+      failed_when: vphp.x_ansible_default is defined
+
+    - name: -- VERIFY NOT DEFAULT SSL SITE --
+      uri:
+        url: 'https://test-ssl.local/'
+        return_content: yes
+        validate_certs: no
+      register: notdefaultssl
+      failed_when: notdefaultssl.x_ansible_default is defined
+
+# --------------------------------
+# Check HTTP2
+# --------------------------------
+    - name: SHELL | Check HTTP2
+      shell: nghttp -nv https://localhost 2> /dev/null | grep -q h2
+      args:
+        executable: /bin/sh
+      changed_when: false
+      when: nginx_auto_config_httpv2 and 'http_v2' in nginx_modules
+      tags:
+        - skip_ansible_lint

vars/Debian.yml

@@ -1,5 +1,6 @@
----
-
 nginx_events_use: 'epoll'
 nginx_pid: '/run/nginx.pid'
 nginx_etc_dir: '/etc/nginx'
+
+# Specific sites
+nginx_fcgiwrap_sock: '/var/run/fcgiwrap.socket'

vars/FreeBSD.yml

@@ -1,7 +1,8 @@
----
-
 nginx_events_use: 'kqueue'
 nginx_pid: '/var/run/nginx.pid'
 nginx_etc_dir: '/usr/local/etc/nginx'
 
+# Specific sites
+nginx_fcgiwrap_sock: '/var/run/fcgiwrap/fcgiwrap.sock'
+
 nginx_acmesh_bin: '/usr/local/sbin/acme.sh'

vars/main.yml

@@ -1,5 +1,3 @@
----
-
 nginx_upstream_server_params:
   - key: 'weight'
     default: 1
@@ -42,11 +40,12 @@ nginx_dirs:
     owner: "root"
 
 nginx_templates_no_dir:
+  - '_backuppc'
   - '_proxy'
 
 nginx_servers_default_headers:
   'X-Frame-Options': 'DENY always'
   'X-Content-Type-Options': 'nosniff always'
-  'X-XSS-Protection': '1; mode=block always'
+  'X-XSS-Protection': '1; mode=block'
 
 nginx_acmesh_bin: "{{ nginx_acmesh_dir }}/acme.sh"