Compat python3

- Use filter plugins
- Acme: can use proxy protocol
- Acme: uses all sites name
- Acme: add more tests while crashing

.gitignore

@@ -1,2 +1,5 @@
 .vagrant*
 *.swp
+*.retry
+*.pyc
+/tests/HanXHX.php

.travis.yml

@@ -1,13 +1,44 @@
 env:
-  - PLATFORM=debian-wheezy
-  - PLATFORM=debian-jessie
+  - PLATFORM='docker-debian-stretch'          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-buster'           ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.8,<2.9'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.8,<2.9'
+  - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.9,<2.10'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.9,<2.10'
+
+matrix:
+  fast_finish: true
 
 sudo: required
 
+dist: trusty
+
 language: python
+python:
+  - 2.7
+  - 3.6
 
 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"
+  - ansible-galaxy install -p ./tests HanXHX.php,master
+
 script:
-  - docker build -f tests/$PLATFORM.Dockerfile -t test-$PLATFORM . && docker run --name $PLATFORM test-$PLATFORM
+  - 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/

README.md

@@ -1,32 +1,52 @@
-Nginx for Debian Ansible role
-=============================
+Nginx for Debian/FreeBSD Ansible role
+=====================================
 
-[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.nginx-blue.svg)](https://galaxy.ansible.com/list#/roles/4399) [![Build Status](https://travis-ci.org/HanXHX/ansible-nginx.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-nginx)
+[![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.
+Install and configure Nginx on Debian/FreeBSD.
 
 Features:
 
 - SSL/TLS "hardened" support
-- Manage basic auth on vhost / location
+- Manage basic auth on site / location
 - Proxy + Upstream
 - Fast PHP configuration
-- Preconfigured vhost templates (should work on many app)
-- Auto-configure HTTP2 on SSL/TLS vhosts
+- Preconfigured site templates (should work on many app)
+- Auto-configure HTTP2 on SSL/TLS sites
+- Manage dynamic modules (install and loading)
+- Deploy custom facts.d with sites config
+- Can listen with proxy protocol
+- Generate certificates with acme.sh (let's encrypt) -- *EXPERIMENTAL*
+
+Supported OS:
+
+| OS                 | Working | Stable (active support) |
+| ------------------ | ------- | ----------------------- |
+| Debian Jessie (8)  | Yes     | Check latest supported version ([1.5.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.5.0)) |
+| Debian Stretch (9) | Yes     | Yes                     |
+| Debian Buster (10) | Yes     | No                      |
+| FreeBSD 11         | Yes     | No                      |
+| FreeBSD 12         | Yes     | No                      |
 
 Requirements
 ------------
 
-None. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
+Ansible 2.6+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
 
 Role Variables
 --------------
 
 ### Packaging
 
+Debian:
+
 - `nginx_apt_package`: APT nginx package (try: apt-cache search ^nginx)
 - `nginx_backports`: Install nginx from backport repository (bool)
 
+FreeBSD:
+
+- `nginx_pkgng_package`: PKGNG nginx package (should be "nginx" or "nginx-devel")
+
 ### Shared
 
 - `nginx_root`: root directory where you want to have your files
@@ -34,6 +54,8 @@ Role Variables
 - `nginx_resolver`: list of DNS resolver (default: OpenDNS)
 - `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
 
@@ -43,28 +65,57 @@ Role Variables
 - `nginx_events_*`: all variables in events block
 - `nginx_http_*`: all variables in http block
 - `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
+
+### Misc
+
+- `nginx_debug_role`: set _true_ if you need to see output of no\_log tasks 
+
+About modules
+-------------
+
+Last updates from Debian backports loads modules from /etc/nginx/modules-enabled directory. Disabling/Enabling is not supported anymore. Please wait further update.
 
 Fine configuration
 ------------------
 
-[Vhost configuration](doc/vhost.md)
+[Site configuration](doc/site.md)
 
 [PHP configuration](doc/php.md)
 
 [Upstream Configuration](doc/upstream.md)
 
-[Vhost configuration](doc/vhost.md)
-
 [SSL/TLS Configuration](doc/ssl.md)
 
 [Basic Auth](doc/auth.md)
 
+[FreeBSD](doc/freebsd.md)
+
+[acme.sh](doc/acme.md)
+
+Note
+----
+
+- Active support for Debian.
+- FreeBSD support is experimental (no Travis). I only test (for the moment) 10.2 (but it can work on other versions).
+- I don't manage BackupPC for FreeBSD (PR welcome).
 
 Dependencies
 ------------
 
 None
 
+
+If you need to dev this role locally
+------------------------------------
+
+Before use vagrant, run once:
+
+```
+ansible-galaxy install -p ./tests/ HanXHX.php,master
+```
+
 Example Playbook
 ----------------
 
@@ -75,6 +126,19 @@ License
 
 GPLv2
 
+
+Donation
+--------
+
+If this code helped you, or if you’ve used them for your projects, feel free to buy me some :beers:
+
+- Bitcoin: `1BQwhBeszzWbUTyK4aUyq3SRg7rBSHcEQn`
+- Ethereum: `63abe6b2648fd892816d87a31e3d9d4365a737b5`
+- Litecoin: `LeNDw34zQLX84VvhCGADNvHMEgb5QyFXyD`
+- Monero: `45wbf7VdQAZS5EWUrPhen7Wo4hy7Pa7c7ZBdaWQSRowtd3CZ5vpVw5nTPphTuqVQrnYZC72FXDYyfP31uJmfSQ6qRXFy3bQ`
+
+No crypto-currency? :star: the project is also a way of saying thank you! :sunglasses:
+
 Author Information
 ------------------
 

Vagrantfile

@@ -5,28 +5,73 @@
 
 Vagrant.configure("2") do |config|
 
-  vms = [
-    [ "debian-wheezy", "deb/wheezy-amd64" , "192.168.33.27" ],
-    [ "debian-jessie", "deb/jessie-amd64", "192.168.33.28" ],
-    [ "debian-stretch", "sharlak/debian_stretch_64", "192.168.33.29" ]
+  vms_debian = [
+    { :name => "debian-stretch", :box => "debian/stretch64", :vars => {} },
+    { :name => "debian-buster", :box => "debian/buster64", :vars => {} }
   ]
 
-  config.vm.provider "virtualbox" do |v|
-    v.cpus = 1
-    v.memory = 256
-  end
+  vms_freebsd = [
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} },
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} }
+  ]
 
-  vms.each do |vm|
-    config.vm.define vm[0] do |m|
-      m.vm.box = vm[1]
-      m.vm.network "private_network", ip: vm[2]
+  conts = [
+    { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => {} },
+    { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => {} },
+  ]
 
+  config.vm.network "private_network", type: "dhcp"
+  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
+
+  conts.each do |opts|
+    config.vm.define opts[:name] do |m|
+      m.vm.provider "docker" do |d|
+        d.image = opts[:docker]
+        d.remains_running = true
+        d.has_ssh = true
+      end
       m.vm.provision "ansible" do |ansible|
         ansible.playbook = "tests/test.yml"
-        ansible.groups = { "test" => [ vm[0] ] }
         ansible.verbose = 'vv'
-        ansible.sudo = true
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true, is_docker: true })
       end
     end
   end
+
+  vms_debian.each do |opts|
+    config.vm.define opts[:name] do |m|
+      m.vm.box = opts[:box]
+      m.vm.provider "virtualbox" do |v|
+        v.cpus = 1
+        v.memory = 256
+      end
+      m.vm.provision "ansible" do |ansible|
+        ansible.playbook = "tests/test.yml"
+        ansible.verbose = 'vv'
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true })
+      end
+    end
+  end
+
+  vms_freebsd.each do |opts|
+    config.vm.base_mac = "080027D14C66"
+    config.vm.define opts[:name] do |m|
+      m.vm.box = opts[:box]
+      m.vm.provider "virtualbox" do |v, override|
+        override.ssh.shell = "csh"
+        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 "ansible" do |ansible|
+        ansible.playbook = "tests/test.yml"
+        ansible.verbose = 'vv'
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true, "ansible_python_interpreter": '/usr/local/bin/python' })
+      end
+    end
+  end
+
 end

defaults/main.yml

@@ -1,38 +1,39 @@
 ---
 
+# Debian
 nginx_apt_package: nginx-full
 nginx_backports: false
+# FreeBSD
+nginx_pkgng_package: nginx
 
 #
 # Nginx shared variables
 #
 nginx_root: "/srv/www"
 nginx_log_dir: '/var/log/nginx'
-nginx_pid: '/run/nginx.pid'
 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_auto_config_httpv2: true
-nginx_default_vhost: null
-nginx_default_vhost_ssl: null
+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: '/etc/nginx/htpasswd'
-nginx_ssl_dir: '/etc/nginx/ssl'
-nginx_helper_dir: '/etc/nginx/helper'
+nginx_htpasswd_dir: '{{ nginx_etc_dir }}/htpasswd'
+nginx_ssl_dir: '{{ nginx_etc_dir }}/ssl'
+nginx_helper_dir: '{{ nginx_etc_dir}}/helper'
 
 #
 # Load upstream
 #
 
 # PHP
-nginx_php: false
-nginx_php_sockets:
-  - unix_socket: "/var/run/php5-fpm.sock"
-nginx_upstreams: []
+nginx_php: []
 
 #
 # Nginx configuration
@@ -45,7 +46,6 @@ nginx_worker_processes: '{{ ansible_processor_vcpus }}'
 #
 nginx_events_worker_connections: '512'
 nginx_events_multi_accept: 'on'
-nginx_events_use: 'epoll'
 
 #
 # Nginx HTTP
@@ -81,14 +81,31 @@ nginx_http_gzip_vary: 'on'
 nginx_http_gzip_disable: '"msie6"'
 
 #
-# nginx_http_custom
+# Custom global configuration
 #
-nginx_http_custom: []
+nginx_custom_http: []
 
 #
-# Vhosts
+# Nginx default
 #
-nginx_vhosts: []
+nginx_default_listen:
+  - '80'
+  - '[::]:80'
+nginx_default_listen_ssl:
+  - '443'
+  - '[::]:443'
+nginx_default_listen_proxy_protocol: []
+nginx_default_listen_proxy_protocol_ssl: []
+
+#
+# Sites
+#
+nginx_sites: []
+
+#
+# Upstreams
+#
+nginx_upstreams: []
 
 #
 # htpasswd
@@ -100,9 +117,28 @@ nginx_htpasswd: []
 #
 nginx_ssl_pairs: []
 
+#
+# Dynamic modules
+#
+nginx_module_packages: []
+nginx_load_modules: []
+
 #
 # Diffie-Hellman
 #
 nginx_dh: null
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
 nginx_dh_length: 2048
+
+#
+# acme.sh
+#
+nginx_acmesh: false
+nginx_acmesh_dir: "/opt/acme.sh"
+nginx_acmesh_git_dir: "/tmp/acme.sh"
+nginx_acmesh_test: false
+
+#
+# Debug
+#
+nginx_debug_role: false

doc/acme.md

@@ -0,0 +1,15 @@
+acme.sh
+=======
+
+Notes
+-----
+
+This feature is experimental.
+
+Variables
+---------
+
+- `nginx_acmesh`: (bool) Enable/Disable acme.sh feature
+- `nginx_acmesh_dir`: (string) Install directory
+- `nginx_acmesh_git_dir`: (string) Git directory (removed after install)
+- `nginx_acmesh_test`: (bool) If set to true (default false), uses test mode

doc/auth.md

@@ -4,25 +4,25 @@ Auth Basic management
 Description
 -----------
 
-Auth basic is managed in a separate list. Each auth file can be shared between locations or vhosts.
+Auth basic is managed in a separate list. Each auth file can be shared between locations or sites.
 
 Each htpasswd has few keys:
 
 - `name`: (M) used to create file and as pointee
 - `description`: (M) Used for the message box :)
-- `users`: each users is composed with 3 keys: `name` (M), `password` (M) and `state` present/absent (default: present)
+- `users`: each users is composed with 3 keys: `name` (M), `password` (M) and `state` (O) present/absent (default: present)
 - `state`: (O) present or absent. Default: present
 
-`nginx_htpasswd` should be placed in a vaut file.
+`nginx_htpasswd` should be placed in a vault file.
 
 Example
 -------
 
-```
-nginx_vhosts:
-# htpasswd on all vhost
+```yaml
+nginx_sites:
+# htpasswd on all site
   - name: test.local
-    htpasswd: 'hello'    
+    htpasswd: 'hello'
     template: '_base'
 
 # htpasswd only in /hello
@@ -30,7 +30,7 @@ nginx_vhosts:
     template: '_base'
     location:
       '/hello':
-        - htpasswd: 'hello'    
+        - htpasswd: 'hello'
 
 nginx_htpasswd:
   - name: 'hello'

doc/freebsd.md

@@ -0,0 +1,17 @@
+Freebsd
+=======
+
+Limitations
+-----------
+
+Due to Ansible + FreeBSD limitations (`ansible_processor_vcpus`), You must explicitely set `nginx_worker_processes`.
+
+About modules
+-------------
+
+Dynamic modules must be set with full path (see `nginx_load_modules` path).
+
+Sites not tested
+----------------
+
+- BackupPC

doc/php.md

@@ -1,18 +1,22 @@
 PHP
 ===
 
-- `nginx_php`: boolean if you need to preconfigure PHP (default: false)
-- `nginx_php_sockets`: list of sockets (see bellow)
+`nginx_php`:
+  - `upstream_name` (M)
+  - `sockets`: (O) socket list
+
+If `sockets` is not provided, if uses local unix socket (based on PHP version).
 
 You should see [Nginx upstream module doc](http://nginx.org/en/docs/http/ngx_http_upstream_module.html).
 
 Each socket have:
 
-- `unix_socket`
-- `host`
-- `port`
-- `weight`
-- `max_fails`
-- `fail_timeout`
+- `unix`
 
-With default configuration, it works fine with PHP-FPM. But if you install PHP7 with Dotdeb, path changed between version, you must set well this list.
+XOR
+
+- `host` (M)
+- `port` (M)
+- `weight` (O)
+- `max_fails` (O)
+- `fail_timeout` (O)

doc/site.md

@@ -1,28 +1,37 @@
-Vhost management
-================
+Site management
+===============
 
 You can see many examples in: [tests/test.yml](../tests/test.yml).
 
-`nginx_vhosts`: List of dict. A vhost has few keys. See bellow.
+`nginx_sites`: List of dict. A site has few keys. See bellow.
 
 Common
 ------
 
 - `name`: (M) Domain or list of domain used.
-- `template`: (D) template used to create vhost. Optional if you set `delete` to true or using `redirect_tor`.
-- `enable`: (O) Enable the vhost (default is true)
-- `delete`: (O) Delete the vhost (default is false)
+- `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".
 - `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']```.
 - `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
+- `location_order_before`: (O) Manages location order for `location_before`
 - `more`: (O) Add more custom infos.
 - `upstream_params`: (O) Add upstream params (useful when you want to pass variables to PHP)
 - `override_try_files`: (O) overrides default try\_files defined in template
 - `manage_local_content`: (O) Boolean. Set to false if you do not want to manage local content (images, css...). This option is useless if you use `_proxy` template or `redirect_to` feature.
-- `htpasswd`: (O) References name key in `nginx_htpasswd`. Enable auth basic on all vhost.
+- `htpasswd`: (O) References name key in `nginx_htpasswd`. Enable auth basic on all site. Set "false" to disable.
 - `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. Mandatory when `proto` contains "https"
+- `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.
+- `listen_proxy_protocol_ssl` (O) Enable proxy protocol on https port.
+- `hsts` (O) overwrite default header for hsts
 
 (O): Optional
 (M): Mandatory
@@ -32,10 +41,9 @@ Templates
 ---------
 
 - `_base`: static template
-- `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap))
+- `_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
-- `_nagios3`: access to Nagios3 (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap))
 - `_phalcon`: Phalcon PHP Framework
 - `_php`: PHP base template. Can work with many frameworks/tools
 - `_php_index`: Same as above. But you can only run index.php
@@ -49,17 +57,17 @@ About proxy template
 
 Proxy template allow you to use Nginx as reverse proxy. Usefull when you have an application service such as Redmine, Jenkins...
 
-You have many key added to vhost key:
+You have many key added to site key:
 
 - `upstream_name`: (O) upstream name used to pass proxy
-- `proxy_params`: (M) list of raw params passed to the vhost
+- `proxy_params`: (M) list of raw params passed to the site
 
 (O) : Optional
 
-Default vhosts
+Default sites
 --------------
 
-You can manage default vhost by setting domain name to these variables.
+You can manage default site by setting domain name to these variables.
 
-- `nginx_default_vhost`
-- `nginx_default_vhost_ssl`
+- `nginx_default_site`
+- `nginx_default_site_ssl`

doc/ssl.md

@@ -15,28 +15,42 @@ Variables
 Cert/Key pairs
 --------------
 
-This list have 3 mandatory keys:
+Each pair must have a `name`.
+Note: `name` is used to deploy key/cert. With defaults values dans `name` = "foo", key is -> /etc/nginx/ssl/foo/foo.key
 
-- `name`: MUST be unique 
+### Content mode
+
+Key/Cert content is stored in variable. Usefull with vault.
 
 - `key`: content of the private key
 - `cert`: content of the public key
 
-OR
+### Remote file
+
+You can use these variables if you use another task/role to manages your certificates.
 
 - `dest_cert`: remote path where certificate is located
 - `dest_key`: remote path where key is located
 
+### Self signed
 
-Note: `name` is used to deploy key/cert. With defaults values dans `name` = "foo", key is -> /etc/nginx/ssl/foo/foo.key
+Create a self-signed pair and deploy it. Do not use this feature in production.
+
+- `self_signed`: set true to use this featrure
+- `force`: optional feature (default: false), force regen pair (not idempotent)
+
+### Acme
+
+Uses acme.sh to create free certificates. It uses HTTP-01 challenge. Use this feature for standalone servers.
+
+- `acme`: set true to use this feature. It uses `name` (can be a string or string list).
+
+Have a look to [acme configuratuion](acme.md configuration).
 
 Tips
 ----
 
-Deploying key/cert is not mandatory with this role. You can manage it in other place ([letsencrypt](https://letsencrypt.org/)? :)). You just need to set `dest_cert` and `dest_key`!
-
-If you set all, you can deploy your key everywhere with wanted data!
-
+- In `nginx_sites`, `ssl_name` is mandatory. This role will search in `nginx_ssl_pairs` with site `name` (first in list if it's a list).  
 
 Diffie-Hellman
 --------------
@@ -46,12 +60,22 @@ If you do not specify any dh param, this role auto generates it.
 Example
 -------
 
-```
-nginx_vhosts;
+```yaml
+nginx_sites;
   - name: 'test-ssl.local'
     proto: ['http', 'https']
     template: '_base'
     ssl_name: 'mysuperkey'
+  - name: 'test-ssl2.local'
+    proto: ['http', 'https']
+    template: '_base'
+  - name: 'test-ssl3.local'
+    proto: ['http', 'https']
+    template: '_base'
+  - name: 'test-self-signed.local'
+    proto: ['http', 'https']
+    template: '_base'
+    ssl_name: 'this.is.self.signed'
 
 nginx_ssl_pairs:
   - name: mysuperkey
@@ -63,5 +87,10 @@ nginx_ssl_pairs:
       -----BEGIN CERTIFICATE-----
       ....(snip)....
       -----END CERTIFICATE-----
+  - name: test-ssl2.local
+    acme: true
+  - name: this.is.self.signed
+    self_signed: true
+    force: false
 ```
 

doc/upstream.md

@@ -3,14 +3,13 @@ Upstream management
 
 `nginx_upstreams`: List of dict. An upstream has few keys. See bellow.
 
-Note: Few params are unavailable on old Nginx version. But this role do _not_ put it if your version is too old!
-
 Upstream params
 ---------------
 
-- `name`: upstream name. Can be use in vhost with *proxy_pass http://upstream_name*
+- `name`: upstream name. Can be use in site with *proxy_pass http://upstream_name*
 - `params`: list of param (hash, zone...)
 - `servers`: each upstream MUST have at least 1 server
+- `state`: Optional. Can be 'absent' or 'present'
 
 Server params
 -------------
@@ -25,5 +24,18 @@ All this params are optional. You should see [Nginx upstream doc](http://nginx.o
 - `backup`
 - `down`
 - `route`
-- `slow`start`
+- `slow_start`
 
+Example
+-------
+
+```yaml
+nginx_upstreams:
+  - name: 'proxy_apache'
+    servers:
+      - path: '127.0.0.1:80'
+        max_conns: 150
+        weight: 10
+        down: false
+    state: 'present'
+```

files/web/index.html

@@ -1 +0,0 @@
-<h1>HTML works</h1>

files/web/index.php

@@ -1,3 +0,0 @@
-<?php
-
-echo "<h1>PHP works!</h1>";

filter_plugins/nginx.py

@@ -0,0 +1,68 @@
+def nginx_site_filename(site):
+    if 'filename' in site:
+        return site['filename']
+    else:
+        return nginx_site_name(site)
+
+def nginx_site_name(site):
+    if isinstance(site['name'], list):
+        return site['name'][0]
+    else:
+        return site['name']
+
+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:
+        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:
+        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 '''
+
+    def filters(self):
+        return {
+            'nginx_site_filename': nginx_site_filename,
+            '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_all_site_names': nginx_all_site_names,
+            'nginx_search_by_ssl_name': nginx_search_by_ssl_name
+        }

filter_plugins/php.py

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

handlers/main.yml

@@ -1,4 +1,46 @@
 ---
 
 - name: reload nginx
-  action: service name=nginx state=reloaded enabled=yes
+  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: real-restart nginx
+  service:
+    name: nginx
+    state: restarted
+  when: ansible_virtualization_type != 'docker'
+
+- name: docker reload nginx
+  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,16 +1,28 @@
 ---
 galaxy_info:
   author: Emilien Mantel
-  description: Nginx for Debian 
+  description: Nginx for Debian / FreeBSD
   company:
-  license: GPLv2 
-  min_ansible_version: 2.0
+  license: GPLv2
+  min_ansible_version: 2.6
   platforms:
   - name: Debian
     versions:
-    - wheezy
-    - jessie
-  categories:
+    - stretch
+    - buster
+  - name: FreeBSD
+    versions:
+    - 11.0
+    - 11.1
+    - 12.0
+  galaxy_tags:
   - web
+  - proxy
+  - http
+  - http2
+  - https
+  - ssl
+  - tls
+  - nginx
+  - cdn
 dependencies: []
- 

tasks/config.yml

@@ -1,21 +1,45 @@
 ---
 
 - name: TEMPLATE | Deploy nginx.conf
-  template: >
-    src=etc/nginx/nginx.conf.j2
-    dest=/etc/nginx/nginx.conf
+  template:
+    src: "etc/nginx/nginx.conf.j2"
+    dest: "{{ nginx_etc_dir }}/nginx.conf"
   notify: reload nginx
 
 - name: TEMPLATE | Deploy all helpers
-  template: >
-    src={{ item }}
-    dest={{ nginx_helper_dir }}/{{ item | basename | regex_replace('\.j2$','') }}
+  template:
+    src: "{{ item }}"
+    dest: "{{ nginx_helper_dir }}/{{ item | basename | regex_replace('.j2$','') }}"
   with_fileglob: '../templates/etc/nginx/helper/*.j2'
   notify: reload nginx
 
 - name: TEMPLATE | Deploy custom http configuration
-  template: >
-    src=etc/nginx/conf.d/custom.conf.j2
-    dest=/etc/nginx/conf.d/custom.conf
+  template:
+    src: "etc/nginx/conf.d/custom.conf.j2"
+    dest: "{{ nginx_etc_dir }}/conf.d/custom.conf"
   notify: reload nginx
 
+- name: LINEINFILE | Fix path
+  lineinfile:
+    regexp: '{{ item.0.regexp }}'
+    line: '{{ item.0.line }}'
+    dest: '{{ item.1 }}'
+  loop: "{{ list_one | product(list_two) | list }}"
+  vars:
+    list_one:
+      - regexp: '^fastcgi_param  SCRIPT_FILENAME'
+        line: 'fastcgi_param  SCRIPT_FILENAME    $realpath_root$fastcgi_script_name;'
+      - regexp: '^fastcgi_param  DOCUMENT_ROOT'
+        line: 'fastcgi_param  DOCUMENT_ROOT      $realpath_root;'
+    list_two:
+      - '{{ nginx_etc_dir }}/fastcgi.conf'
+  when: nginx_fastcgi_fix_realpath
+
+- name: COPY | Add modules manually
+  copy:
+    content: |
+      {% for m in nginx_load_modules %}
+      load_module {{ m }};
+      {% endfor %}
+    dest: "{{ nginx_etc_dir }}/modules-enabled/000-modules.conf"
+  notify: reload nginx

tasks/htpasswd.yml

@@ -1,19 +1,18 @@
 ---
 
 - name: FILE | Delete htpasswd file
-  file: >
-    path={{ nginx_htpasswd_dir }}/{{ item.name }}
-    state=absent
-  with_items: nginx_htpasswd
+  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
 
 - name: HTPASSWD | Manage files
-  htpasswd: >
-    name={{ item.1.name }}
-    password={{ item.1.password }}
-    state={{ item.1.state | default('present') }}
-    path={{ nginx_htpasswd_dir }}/{{ item.0.name }}
-  with_subelements:
-    - nginx_htpasswd
-    - users
-  when: item.0.state is not defined or item.0.state == 'present' 
+  htpasswd:
+    name: "{{ item.1.name }}"
+    password: "{{ item.1.password }}"
+    path: "{{ nginx_htpasswd_dir }}/{{ item.0.name }}"
+  loop: "{{ nginx_htpasswd | subelements('users') }}"
+  when: item.0.state is not defined or item.0.state == 'present'
+  no_log: not nginx_debug_role

tasks/install.yml

@@ -1,13 +0,0 @@
----
-
-- name: APT | Install nginx and dependencies
-  apt: >
-    pkg={{ nginx_apt_package }}
-    state=present
-    update_cache=yes
-    cache_valid_time=3600
-    default_release={{ ansible_distribution_release + '-backports' if nginx_backports else ansible_distribution_release }}
-
-- name: APT | Install python-passlib
-  apt: pkg=python-passlib state=present
-

tasks/install_Debian.yml

@@ -0,0 +1,54 @@
+---
+
+- 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{% if ansible_python_version is version('3', '>=') %}3{% endif %}-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

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

tasks/main.yml

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

tasks/prepare.yml

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

tasks/site.yml

@@ -0,0 +1,106 @@
+---
+
+- name: FAIL | Check filenames
+  fail:
+    msg: "Forbidden keyword default on site {{ item | nginx_site_name }}"
+  when: item.filename is defined and item.filename == 'default'
+  loop: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FAIL | Check HTTPS redir and proto
+  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
+    (item.redirect_http is defined and item.redirect_http)
+  loop: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Create root directory
+  file:
+    path: "{{ nginx_root }}"
+    state: directory
+
+- name: FILE | Create root public folders (foreach nginx_sites)
+  file:
+    path: "{{ nginx_root }}/{{ item | nginx_site_filename }}/public"
+    state: directory
+    owner: "{{ item.owner | default(nginx_user) }}"
+    group: "{{ item.group | default(nginx_user) }}"
+    mode: "{{ item.mode | default('0755') }}"
+  loop: "{{ nginx_sites }}"
+  when: >
+    item.root is not defined and
+    (item.template is defined and item.template not in nginx_templates_no_dir) and
+    (item.state is not defined or not item.state != 'absent') and
+    item.redirect_to is not defined
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: TEMPLATE | Create sites
+  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 }}"
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: item.state is not defined or item.state != 'absent'
+  loop: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Delete sites
+  file:
+    path: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
+    state: absent
+  loop: "{{ nginx_sites | product(dirs) | list }}"
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: item.0.state is defined and item.0.state == 'absent'
+  vars:
+    dirs: ['sites-available', 'sites-enabled']
+  loop_control:
+    label: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
+
+- name: FILE | Enable sites
+  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', 'restart nginx freebsd']
+  when: >
+    item.state is not defined or item.state == 'present'
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Disable sites
+  file:
+    path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
+    state: absent
+  loop: "{{ nginx_sites }}"
+  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
+  file:
+    path: "{{ nginx_etc_dir }}/sites-enabled/default"
+    state: absent
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: nginx_default_site is not none
+
+- name: FILE | Auto set default site
+  file:
+    src: "{{ nginx_etc_dir }}/sites-available/default"
+    dest: "{{ nginx_etc_dir }}/sites-enabled/default"
+    state: link
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: nginx_default_site is none
+
+- name: TEMPLATE | Deploy facts
+  template:
+    src: etc/ansible/facts.d/nginx.fact.j2
+    dest: /etc/ansible/facts.d/nginx.fact
+    mode: 0644
+  notify: ['setup']

tasks/ssl.yml

@@ -1,39 +0,0 @@
----
-
-- name: COMMAND | Generate DH file
-  command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
-  args:
-    creates: "{{ nginx_dh_path }}"
-  when: nginx_dh is not string
-  notify: reload nginx
-
-- name: COPY | Deploy DH file from vars
-  copy: >
-    content="{{ nginx_dh }}"
-    dest="{{ nginx_dh_path }}"
-  when: nginx_dh is string
-  notify: reload nginx
-
-- name: FILE | Create SSL directories
-  file: >
-    path="{{ nginx_ssl_dir + '/' + item.name }}"
-    state=directory
-  with_items: nginx_ssl_pairs
-  when: item.dest_key is not defined or item.dest_cert is not defined
-
-- name: COPY | Deploy SSL keys
-  copy: >
-    content="{{ item.key }}"
-    dest="{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.key' if item.dest_key is not defined else item.dest_key }}"
-  with_items: nginx_ssl_pairs
-  when: item.key is defined
-  notify: reload nginx
-
-- name: COPY | Deploy SSL certs
-  copy: >
-    content="{{ item.cert }}"
-    dest="{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
-  with_items: nginx_ssl_pairs
-  when: item.cert is defined
-  notify: reload nginx
-

tasks/ssl/acme.yml

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

tasks/ssl/main.yml

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

tasks/ssl/standard.yml

@@ -0,0 +1,72 @@
+---
+
+- block:
+
+  - name: STAT | Get info about 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
+
+- name: COPY | Deploy DH file from vars
+  copy:
+    content: "{{ nginx_dh }}"
+    dest: "{{ nginx_dh_path }}"
+  when: nginx_dh is string
+  notify: restart nginx
+
+- name: FILE | Create SSL directories
+  file:
+    path: "{{ item | nginx_ssl_dir(nginx_ssl_dir) }}"
+    state: directory
+  loop: "{{ nginx_ssl_pairs }}"
+  when: item.dest_key is not defined or item.dest_cert is not defined
+  no_log: not nginx_debug_role
+
+- name: COPY | Deploy SSL keys
+  copy:
+    content: "{{ item.key }}"
+    dest: "{{ item | nginx_key_path(nginx_ssl_dir) }}"
+    mode: 0640
+  loop: "{{ nginx_ssl_pairs }}"
+  when: item.key is defined
+  notify: restart nginx
+  no_log: not nginx_debug_role
+
+- name: COPY | Deploy SSL certs
+  copy:
+    content: "{{ item.cert }}"
+    dest: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
+    mode: 0644
+  loop: "{{ nginx_ssl_pairs }}"
+  when: item.cert is defined
+  notify: restart nginx
+  no_log: not nginx_debug_role
+
+- name: COMMAND | Create self-signed certificates
+  command: |
+    openssl req
+      -new -newkey rsa:2048 -sha256 -days 3650 -nodes -x509
+      -subj '/CN={{ item | nginx_site_name }}'
+      -keyout {{ item | nginx_key_path(nginx_ssl_dir) }}
+      -out {{ item | nginx_cert_path(nginx_ssl_dir) }}
+  args:
+    chdir: "{{ item | nginx_ssl_dir(nginx_ssl_dir) }}"
+    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
+  no_log: not nginx_debug_role

tasks/upstream.yml

@@ -1,11 +1,23 @@
 ---
 
 - name: TEMPLATE | Deploy PHP upstream to Nginx
-  template: src=etc/nginx/upstream/php.conf.j2 dest=/etc/nginx/conf.d/php.conf
-  when: nginx_php
+  template:
+    src: "etc/nginx/conf.d/php.conf.j2"
+    dest: "{{ nginx_etc_dir }}/conf.d/php.conf"
   notify: reload nginx
 
 - name: TEMPLATE | Deploy other upstreams
-  template: src=etc/nginx/upstream/upstream.conf.j2 dest=/etc/nginx/conf.d/upstream-{{ item.name }}.conf
-  with_items: nginx_upstreams
+  template:
+    src: "etc/nginx/conf.d/_upstream.conf.j2"
+    dest: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
+  loop: "{{ nginx_upstreams }}"
+  when: item.state is not defined or item.state == 'present'
+  notify: reload nginx
+
+- name: FILE | Delete other upstreams
+  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

tasks/vhost.yml

@@ -1,93 +0,0 @@
----
-
-- name: FAIL | Check vhost and SSL/TLS support
-  fail: msg="Missmatch configuration for vhost {{ item.name if item.name is string else item.name[0] }}"
-  when: >
-    item.proto is defined and
-    'https' in item.proto and
-    item.ssl_name is not defined
-  with_items: nginx_vhosts
-
-- name: FILE | Create root directory
-  file: >
-    path={{ nginx_root }}
-    state=directory
-
-- name: FILE | Create root folders (foreach nginx_vhosts)
-  file: >
-    path={{ nginx_root }}/{{ item.name if item.name is string else item.name[0] }}
-    state=directory
-    owner={{ item.owner | default('www-data') }}
-    group={{ item.group | default('www-data') }}
-    mode={{ item.mode | default('0755') }}
-  with_items: nginx_vhosts
-  when: >
-    item.root is not defined and
-    (item.template is defined and item.template not in nginx_templates_no_dir) and
-    (item.delete is not defined or not item.delete) and
-    item.redirect_to is not defined
-
-- name: FILE | Create root public folders (foreach nginx_vhosts)
-  file: >
-    path={{ nginx_root }}/{{ item.name if item.name is string else item.name[0] }}/public
-    state=directory
-    owner={{ item.owner | default('www-data') }}
-    group={{ item.group | default('www-data') }}
-    mode={{ item.mode | default('0755') }}
-  with_items: nginx_vhosts
-  when: >
-    item.root is not defined and
-    (item.template is defined and item.template not in nginx_templates_no_dir) and
-    (item.delete is not defined or not item.delete) and
-    item.redirect_to is not defined
-
-- name: TEMPLATE | Create vhosts
-  template: >
-    src=etc/nginx/sites-available/{{ item.template if item.redirect_to is not defined else '_redirect' }}.j2
-    dest=/etc/nginx/sites-available/{{ item.name if item.name is string else item.name[0] }}
-  with_items: nginx_vhosts
-  notify: reload nginx
-  when: item.delete is not defined or not item.delete
-
-#- name: COPY | Add index.html / index.php
-#  copy: src={{ item }} dest={{ nginx_root }}/{{ item.name }}/public/{{ item }} owner=www-data group=www-data mode=0666
-#  with_fileglob: "web/*"
-
-- name: FILE | Delete vhosts
-  file: path=/etc/nginx/sites-available/{{ item.name if item.name is string else item.name[0] }} state=absent
-  with_items: nginx_vhosts
-  notify: reload nginx
-  when: item.delete is defined and item.delete
-
-- name: FILE | Enable vhosts
-  file: >
-    src=/etc/nginx/sites-available/{{ item.name if item.name is string else item.name[0] }}
-    dest=/etc/nginx/sites-enabled/{{ item.name if item.name is string else item.name[0] }}
-    state=link
-  with_items: nginx_vhosts
-  notify: reload nginx
-  when: >
-    ((item.enable is not defined) or
-    (item.enable is defined and item.enable)) and
-    (item.delete is not defined or not item.delete)
-
-- name: FILE | Disable vhosts
-  file: path=/etc/nginx/sites-enabled/{{ item.name if item.name is string else item.name[0] }} state=absent
-  with_items: nginx_vhosts
-  notify: reload nginx
-  when: (item.enable is defined and not item.enable) or (item.delete is defined and item.delete)
-
-- name: FILE | Delete default vhost when explicitely defined
-  file: >
-    path=/etc/nginx/sites-enabled/default
-    state=absent
-  notify: reload nginx
-  when: nginx_default_vhost is not none
-
-- name: FILE | Auto set default vhost
-  file: >
-    src=/etc/nginx/sites-available/default
-    dest=/etc/nginx/sites-enabled/default
-    state=link
-  notify: reload nginx
-  when: nginx_default_vhost is none

templates/etc/ansible/facts.d/nginx.fact.j2

@@ -0,0 +1,4 @@
+{
+       "fact_nginx_sites":
+       {{ nginx_sites | to_nice_json(indent=8) }}
+}

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

@@ -0,0 +1,18 @@
+{% 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 {{ port }};
+{% endfor %}
+{% for port in __listen_proxy_protocol %}
+	listen {{ port }} proxy_protocol;
+{% endfor %}
+
+	server_name {{ site | nginx_all_site_names | join(" ") }};
+
+	location / {
+		return 503;
+	}
+}

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

@@ -1,5 +1,5 @@
 {%- macro s(key, value, is_bool, min_version) %}
-{% if nginx_version.stdout | version_compare(min_version, 'ge') %}
+{% if nginx_version.stdout is version(min_version, 'ge') %}
 {% if is_bool and value %} {{ key }}{% elif not is_bool %} {{ key }}={{ value }}{% endif %}
 {% endif %}
 {%- endmacro -%}

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

@@ -0,0 +1,29 @@
+#
+# {{ ansible_managed }}
+#
+
+{% for php in nginx_php %}
+upstream {{ php.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') }};
+{% endif %}
+{% 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

@@ -2,17 +2,13 @@
 # {{ ansible_managed }}
 #
 
-ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+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_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;
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
-add_header X-Frame-Options DENY;
-add_header X-Content-Type-Options nosniff;
-{% if nginx_version.stdout | version_compare('1.3.7', 'ge') %}
+ssl_session_tickets off;
 ssl_stapling on;
 ssl_stapling_verify on;
-{% endif %}
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
 resolver_timeout {{ nginx_resolver_timeout }};
 ssl_dhparam {{ nginx_dh_path }};

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

@@ -2,17 +2,15 @@
 # {{ ansible_managed }}
 #
 
-ssl_ciphers "AES256+EECDH:AES256+EDH";
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+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_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;
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
-add_header X-Frame-Options DENY;
-add_header X-Content-Type-Options nosniff;
-{% if nginx_version.stdout | version_compare('1.3.7', 'ge') %}
+ssl_session_tickets off;
 ssl_stapling on;
 ssl_stapling_verify on;
-{% endif %}
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
 resolver_timeout {{ nginx_resolver_timeout }};
 ssl_dhparam {{ nginx_dh_path }};

templates/etc/nginx/nginx.conf.j2

@@ -5,6 +5,7 @@
 user {{ nginx_user }};
 worker_processes {{ nginx_worker_processes }};
 pid {{ nginx_pid }};
+include {{ nginx_etc_dir }}/modules-enabled/*.conf;
 
 events {
 	worker_connections {{ nginx_events_worker_connections }};
@@ -14,7 +15,7 @@ events {
 
 http {
 	types_hash_max_size {{ nginx_http_types_hash_max_size }};
-	include /etc/nginx/mime.types;
+	include {{ nginx_etc_dir }}/mime.types;
 
 	default_type {{ nginx_http_default_type }};
 	access_log {{ nginx_http_access_log }};
@@ -45,8 +46,8 @@ http {
 	gzip_vary {{ nginx_http_gzip_vary }};
 	gzip_disable {{ nginx_http_gzip_disable }};
 
-	include /etc/nginx/conf.d/*.conf;
-	include /etc/nginx/sites-enabled/*;
+	include {{ nginx_etc_dir }}/conf.d/*.conf;
+	include {{ nginx_etc_dir }}/sites-enabled/*;
 }
 
 # vim:filetype=nginx

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

@@ -25,7 +25,7 @@
 {% block template_upstream_location %}
 	location ~ \.cgi$ {
 		gzip off;
-		include /etc/nginx/fastcgi_params;
+		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;

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

@@ -1,20 +1,68 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item.name if item.name is string else item.name[0] %}
-{% set __listen = item.listen | default(['80']) %}
-{% set __listen_ssl = item.listen_ssl | default(['443']) %}
+{% set __main_name =  item | nginx_site_name %}
+{% set __listen = item.listen | default(nginx_default_listen) %}
+{% set __listen_ssl = item.listen_ssl | default(nginx_default_listen_ssl) %}
+{% set __listen_proxy_protocol = item.listen_proxy_protocol | default(nginx_default_listen_proxy_protocol) %}
+{% set __listen_proxy_protocol_ssl = item.listen_proxy_protocol_ssl | default(nginx_default_listen_proxy_protocol_ssl) %}
 {% 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 __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 %}
+{% macro locations(list, order) %}
+{% if order | length > 0 %}
+	# --> Custom locations
+{% for location in order %}
+	location {{ location }} {
+{% set opts = list[location] %}
+{% for opt in opts %}
+{% if opt.htpasswd is defined %}
+{{ htpasswd(opt.htpasswd, 2) }}
+{% else %}
+	{{ opt }}
+{% endif %}
+{% endfor  %}
+	}
+{% endfor %}
+	# <-- Custom locations
+{% endif %}
+{% endmacro %}
 {% macro htpasswd(htpasswd_name, indent=1) -%}
-{% for ht in nginx_htpasswd if ht.name == htpasswd_name %}
+{%- if htpasswd_name != false %}
+{%- for ht in nginx_htpasswd if ht.name == htpasswd_name %}
 {{ "\t" * indent }}auth_basic "{{ ht.description }}";
 {{ "\t" * indent }}auth_basic_user_file {{ nginx_htpasswd_dir }}/{{ ht.name }};
-{% endfor%}
+{%- endfor %}
+{%- endif %}
 {%- endmacro %}
 {% macro ssl(ssl_name) %}
-{% for sn in nginx_ssl_pairs if sn.name == ssl_name %}
-	ssl_certificate {{ nginx_ssl_dir + '/' + ssl_name + '/' + ssl_name + '.crt' if sn.dest_cert is not defined else sn.dest_cert }};
-	ssl_certificate_key {{ nginx_ssl_dir + '/' + ssl_name + '/' + ssl_name + '.key' if sn.dest_key is not defined else sn.dest_key }};
+{% for sn in nginx_ssl_pairs if (sn.name is defined and (sn | nginx_site_name) == ssl_name) %}
+	ssl_certificate {{ sn | nginx_cert_path(nginx_ssl_dir) }};
+	ssl_certificate_key {{ sn | nginx_key_path(nginx_ssl_dir) }};
 {% endfor %}
 {%- endmacro %}
+{% macro httpsredirect(name) %}
+server {
+{% for port in __listen %}
+	listen {{ port }};
+{% endfor %}
+{% for port in __listen_proxy_protocol %}
+	listen {{ port }} proxy_protocol;
+{% endfor %}
+	server_name {{ server_name(name) }};
+	location / {
+		return 301 https://{{ name }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
+	}
+}
+{% endmacro %}
+
 #
 # {{ ansible_managed }}
 #
@@ -25,42 +73,63 @@
 server {
 {% if 'http' in __proto %}
 {% for port in __listen %}
-	listen {{ port }}{% if nginx_default_vhost == __main_name %} default_server{% endif %};
+	listen {{ port }}{% if nginx_default_site == __main_name %} default_server{% 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_vhost_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules.stdout_lines %}http2{% endif %};
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if __http2 %} http2{% endif %};
 {% endfor %}
-{{ ssl(item.ssl_name) }}
+{% 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 %}
-	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(' ') }}{% endif %};
+{% endif %}
+	server_name {{ server_name(item.name) }};
 {% block root %}
 {% if item.root is defined %}
 	root {{ item.root }};
 {% else %}
-	root {{ nginx_root }}/{{ __main_name }}/public;
+	root {{ nginx_root }}/{{ item | nginx_site_filename }}/public;
 {% endif %}
 {% endblock %}
 {% block template_index %}
 	index {{ item.index | default('index.html index.htm') }};
 {% endblock %}
 
+{% block template_more %}
 {% if item.more is defined and item.more is iterable %}
 {% for line in item.more %}
 	{{ line }}
 {% endfor %}
 {% endif %}
+{% endblock %}
 
 {% if item.htpasswd is defined %}
 {{ htpasswd(item.htpasswd, 1) }}
 {% endif %}
 
-{% if not __location.has_key('/') %}
+{% block template_headers %}
+	# --> Custom headers
+{% for key, value in __headers.items() %}
+	add_header {{ key }} "{{ value | regex_replace('\s+always$', '') }}"{% if value | regex_search('\s+always$') %} always{% endif %};
+{% endfor %}
+	# <-- Custom headers
+{% endblock %}
+
+{{ locations(__location_before, __location_order_before) }}
+
+{% if not '/' in  __location %}
 	location / {
 {% block template_try_files %}
-		try_files {{ override_try_files | default('$uri $uri/ =404') }};
+		try_files {{ item.override_try_files | default('$uri $uri/ =404') }};
 {% endblock %}
 	}
 {% endif %}
@@ -70,6 +139,8 @@ server {
 {% block template_custom_location %}
 {% endblock %}
 
+{{ locations(__location, __location_order) }}
+
 {% block template_local_content %}
 {% if item.manage_local_content is not defined or item.manage_local_content %}
 	location ~ /\.ht {
@@ -82,38 +153,42 @@ server {
 		log_not_found off;
 	}
 
-	location ~* \.(txt|js|css|png|jpe?g|gif|ico|svg)$ {
+	location ~* \.(txt|js|css|png|jpe?g|gif|ico|svg|(o|t)tf|woff2?|eot)$ {
 		expires 30d;
 		log_not_found off;
 	}
 {% endif %}
 {% endblock %}
 
-{% if __location is iterable and __location | length > 0 %}
-	# --> Custom locations
-{% for location, opts in __location.iteritems() %}
-	location {{ location }} {
-{% for opt in opts %}
-{% if opt.htpasswd is defined %}{{ htpasswd(opt.htpasswd, 2) }}{% else %}
-		{{ opt }}
-{% endif %}
-{% endfor  %}
-	}
-{% endfor %}	# <-- Custom locations
-{% endif %}
-
-{% if item.use_access_log is defined and item.use_access_log %}
+{% if item.use_access_log is defined %}
+{% if item.use_access_log %}
 	access_log {{ nginx_log_dir }}/{{ __main_name }}_access.log combined;
 {% else %}
 	access_log off;
 {% endif %}
-{% if item.use_error_log is defined and item.use_error_log %}
+{% endif %}
+{% if item.use_error_log is defined %}
+{% if item.use_error_log %}
 	error_log {{ nginx_log_dir }}/{{ __main_name }}_error.log {{ nginx_error_log_level }};
 {% else %}
 	error_log off;
 {% endif %}
+{% endif %}
 }
 
+{% if item.redirect_https is defined and item.redirect_https %}
+#
+# Redirect HTTP to HTTPS
+#
+{% if item.name is string %}
+{{ httpsredirect(item.name) }}
+{% else %}
+{% for i in item.name %}
+{{ httpsredirect(i) }}
+{% endfor %}
+{% endif %}
+{% endif %}
+
 {% if item.redirect_from is defined and item.redirect_from is iterable %}
 #
 # Redirect from
@@ -122,9 +197,36 @@ server {
 {% for port in __listen %}
 	listen {{ port }};
 {% endfor %}
-	server_name {{ item.redirect_from | join(' ') }};
-	return 301 $scheme://{{ __main_name }}$request_uri;
+{% 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;
+	}
+}
+
+{% if 'https' in __proto %}
+server {
+{% for port in __listen_ssl %}
+	listen {{ port }} ssl{% if __http2 %} http2{% 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;
+	}
 }
 {% endif %}
 
+{% endif %}
+
 # vim:filetype=nginx

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

@@ -1,47 +0,0 @@
-{% extends "_base.j2" %}
-
-{% block root %}
-	root /usr/share/nagios3/htdocs;
-{% endblock %}
-
-{% block template_try_files %}
-{% endblock %}
-
-{% block template_index %}
-	index index.php index.html;
-{% endblock %}
-
-{% block template_local_content %}
-	location ~ /\.ht {
-		deny all;
-	}
-
-	location /stylesheets {
-		alias /etc/nagios3/stylesheets;
-		expires 60d;
-	}
-{% endblock %}
-
-{% block template_upstream_location %}
-	location /cgi-bin/nagios3 {
-		root /usr/lib;
-		try_files $uri =404;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-		fastcgi_pass unix:/var/run/fcgiwrap.socket;
-		fastcgi_param AUTH_USER $remote_user;
-		fastcgi_param REMOTE_USER $remote_user;
-	}
-	location ~ \.php$ {
-		fastcgi_pass php;
-		fastcgi_index index.php;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-	}
-{% endblock %}

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

@@ -1,25 +1,22 @@
 {% extends "_base.j2" %}
+
 {% block template_index %}
 	index {{ item.index | default('index.html index.htm index.php') }};
 {% endblock %}
 
 {% block template_try_files %}
-		try_files {{ override_try_files | default('$uri $uri/ /index.php') }};
+		try_files {{ item.override_try_files | default('$uri $uri/ =404') }};
 {% endblock %}
 
 {% block template_upstream_location %}
 	location ~ \.php$ {
-		fastcgi_pass 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 %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}

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

@@ -2,18 +2,14 @@
 
 {% block template_upstream_location %}
 	location = /index.php {
-		fastcgi_pass 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 %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
 

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

@@ -0,0 +1,18 @@
+{% extends "_php.j2" %}
+
+{% block template_try_files %}
+		try_files {{ item.override_try_files | default('$uri $uri/ /index.php') }};
+{% endblock %}
+
+{% block template_upstream_location %}
+	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;
+	}
+{% endblock %}

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

@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block template_try_files %}
-		include /etc/nginx/proxy_params;
+		include {{ nginx_etc_dir }}/proxy_params;
 		proxy_pass http://{{ item.upstream_name }};
 {% if item.proxy_params is defined and item.proxy_params is iterable %}
 {% for param in item.proxy_params %}

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

@@ -0,0 +1,27 @@
+{% 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 %}

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

@@ -3,3 +3,9 @@
 {% block template_try_files %}
 	try_files $uri $uri/ /index.php?$args;
 {% endblock %}
+
+{% block template_custom_location %}
+	location ~* /(?:uploads|files)/.*\.php$ {
+		deny all;
+	}
+{% endblock %}

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

@@ -1,15 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-
-upstream php {
-{% for item in nginx_php_sockets %}
-{% if item.unix_socket is defined %}
-	server unix:{{ item.unix_socket }} weight={{ item.weight | default('1') }};
-{% else %}
-	server {{ item.host }}:{{ item.port }} weight={{ item.weight | default('1') }} max_fails={{ item.max_fails | default('5') }} fail_timeout={{ item.fail_timeout | default('10s') }};
-{% endif %}
-{% endfor %}
-}
-
-# vim:filetype=nginx

tests/debian-jessie.Dockerfile

@@ -1,4 +0,0 @@
-FROM williamyeh/ansible:debian8-onbuild
-
-RUN apt-get update
-CMD ["sh", "tests/test.sh"]

tests/debian-wheezy.Dockerfile

@@ -1,4 +0,0 @@
-FROM williamyeh/ansible:debian7-onbuild
-
-RUN apt-get update
-CMD ["sh", "tests/test.sh"]

tests/includes/post_Debian.yml

@@ -0,0 +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

@@ -0,0 +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/pre_Debian.yml

@@ -0,0 +1,89 @@
+---
+
+- name: APT_REPOSITORY | Install backports
+  apt_repository:
+    repo: 'deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main'
+    state: present
+  when: nginx_backports
+
+- name: APT | Install needed packages
+  apt:
+    pkg: "{{ packages }}"
+    update_cache: yes
+    cache_valid_time: 3600
+    state: present
+  vars:
+    packages:
+      - cron
+      - curl
+      - daemonize
+      - fcgiwrap
+      - jq
+      - nghttp2
+      - strace
+      - vim
+      - unzip
+
+- name: APT | Install PHP
+  apt:
+    pkg: "{{ pkgs }}"
+    update_cache: yes
+    cache_valid_time: 3600
+    state: present
+  vars:
+    pkgs:
+      - php-cli
+      - php-fpm
+
+- name: SHELL | Get current PHP version
+  shell: php --version | awk '/^PHP/ { print $2 }' | grep -o -E '^.{3}'
+  changed_when: false
+  register: cur_php_version
+
+- name: SERVICE | Force start fcgiwrap
+  service:
+    name: "fcgiwrap"
+    state: started
+
+# Bypasses Ansible+Docker issue. With service module... php is not really started!
+- name: COMMAND | Force start PHP
+  command: "service php{{ cur_php_version.stdout }}-fpm start"
+  args:
+    creates: "/run/php/php{{ cur_php_version.stdout }}-fpm.pid"
+    warn: false
+
+- name: GET_URL | Download ngrok
+  get_url:
+    url: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip"
+    dest: "/tmp/ngrok.zip"
+
+- name: UNARCHIVE | Uncompress ngrok
+  unarchive:
+    src: "/tmp/ngrok.zip"
+    dest: "/tmp"
+    remote_src: yes
+
+- name: SET_FACT | ngrok_path
+  set_fact:
+    ngrok_path: '/tmp/ngrok'
+
+- name: USER | Create PHP User foo
+  user:
+    name: foo
+    system: yes
+
+- name: INCLUDE_ROLE | HanXHX.php
+  include_role:
+    name: "{{ playbook_dir }}/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

@@ -0,0 +1,74 @@
+---
+
+- name: SET_FACT | FreeBSD web user
+  set_fact:
+    nginx_pkgng_package: 'nginx-full'
+    nginx_user: 'www'
+    nginx_php:
+      - upstream_name: 'manual'
+        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
+  pkgng:
+    pkg: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+      - curl
+      - daemonize
+      - fcgiwrap
+#     - GeoIP
+      - jq
+      - nghttp2
+      - php74
+      - 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: yes
+  register: sf
+  loop:
+    - php-fpm
+    - fcgiwrap
+
+- name: STAT | Check ports
+  stat:
+    path: /usr/ports
+  register: ports
+
+- block:
+
+    - name: COMMAND | Get ports
+      command: portsnap fetch --interactive
+
+    - name: COMMAND | Extract ports
+      command: portsnap extract
+      no_log: true
+
+  when: not ports.stat.exists
+
+- name: SHELL | Install ngrok
+  shell: make install clean DISABLE_LICENSES=yes
+  args:
+    chdir: /usr/ports/security/ngrok
+    creates: "{{ ngrok_path }}"

tests/includes/pre_common.yml

@@ -0,0 +1,29 @@
+---
+
+- name: SHELL | Start ngrok
+  shell: daemonize -l /tmp/ngrok.lock {{ ngrok_path }} http 80 -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
+  wait_for:
+    delay: 2
+    port: 4040
+  when: ngrok.changed
+
+- name: SHELL | Get ngrok public address
+  shell: curl 'http://127.0.0.1:4040/api/tunnels/command_line' | jq '.public_url' | grep -oE '[[:alnum:]]+\.ngrok\.io'
+  args:
+    warn: false
+  register: ngrok
+  changed_when: false
+
+- name: LINEINFILE | Tune vimrc
+  lineinfile:
+    line: "set mouse="
+    dest: "{{ item }}/.vimrc"
+    create: yes
+  loop:
+    - /root
+    - /home/vagrant

tests/inventory

@@ -1 +0,0 @@
-localhost

tests/test.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Thanks to https://servercheck.in/blog/testing-ansible-roles-travis-ci-github
-
-DIR=$( dirname $0 )
-INVENTORY_FILE="$DIR/inventory"
-PLAYBOOK="$DIR/test.yml"
-
-set -ev
-
-# Check syntax
-ansible-playbook -i $INVENTORY_FILE -c local --syntax-check -vv $PLAYBOOK
-
-# Check role
-ansible-playbook -i $INVENTORY_FILE -c local --sudo -vv $PLAYBOOK
-
-# Check indempotence
-ansible-playbook -i $INVENTORY_FILE -c local --sudo -vv $PLAYBOOK \
-| grep -q 'changed=0.*failed=0' \
-&& (echo 'Idempotence test: pass' && exit 0) \
-|| (echo 'Idempotence test: fail' && exit 1)

tests/test.yml

@@ -2,35 +2,52 @@
 
 - hosts: all
   pre_tasks:
-    - name: APT_REPOSITORY | Install backports
-      apt_repository: repo='deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main' state=present
-    - name: APT | Install needed packages
-      apt: pkg={{ item }} update_cache=yes cache_valid_time=3600 state=present
-      with_items:
-        - php5-fpm
-        - curl
-        - fcgiwrap
-    - name: SERVICE | Force start services
-      service: name={{ item }} state=started
-      register: sf
-      with_items:
-        - php5-fpm
-        - fcgiwrap
-    - name: PAUSE | Prevent bugs (CGI not fully loaded)
-      pause: seconds=5
-      when: sf.changed
+
+    - name: INCLUDE_TASKS | Pre_tasks related to OS version
+      include_tasks: "includes/pre_{{ ansible_distribution }}.yml"
+
+    - name: IMPORT_TASKS | Pre_tasks common
+      import_tasks: "includes/pre_common.yml"
+
     - name: FILE | Create an internal SSL dir
-      file: path={{ int_ansible_ssl_dir }} state=directory
+      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
+      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
+      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_backports: true
-    nginx_php: true
+    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:
@@ -38,6 +55,13 @@
             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!'
@@ -47,17 +71,21 @@
             state: 'absent'
           - name: 'hanx'
             password: 'qwerty'
-      - name: 'nagios'
-        description: 'Please login to Nagios!'
-        users:
-          - name: 'nagiosadmin'
-            password: 'nagios'
       - name: 'deleteme'
         description: 'Please login!'
         users: []
         state: 'absent'
+    nginx_acmesh: true
+    nginx_acmesh_test: true
     nginx_ssl_pairs:
-      - name: 'test-ssl-predeployed.local'
+      - 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'
@@ -111,74 +139,149 @@
           -----END CERTIFICATE-----
     nginx_custom_http:
       - 'add_header X-ansible 1;'
-    nginx_default_vhost: 'test.local'
-    nginx_default_vhost_ssl: 'test-ssl-predeployed.local'
-    nginx_vhosts:
+      - '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: 'test.local'
+    nginx_default_site_ssl: 'test-ssl-predeployed.local'
+    nginx_sites:
       - name:
           - 'test.local'
           - 'test-alias.local'
           - 'test2-alias.local'
         template: '_base'
-        override_try_files: '$uri $uri index.htm index.html'
+        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;'
-          - 'add_header X-ansible-default 1;'
         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:
+        location_before:
           '/hello':
             - htpasswd: 'hello'
-            - 'default_type "text/html; charset=UTF-8";'
-            - 'echo 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'
-        more:
-          - 'add_header X-proxyfied 1;'
+        headers:
+          'X-proxyfied': '1'
       - name: 'deleted.local'
-        delete: true
+        state: 'absent'
       - name: 'redirect-to.local'
         redirect_to: 'http://test.local'
       - name: 'backuppc.local'
         template: '_backuppc'
         htpasswd: 'hello'
-      - name: 'nagios3.local'
-        template: '_nagios3'
-        htpasswd: 'nagios'
       - name: 'test-ssl.local'
         proto: ['http', 'https']
         template: '_base'
-        ssl_name: 'test-ssl.local'
+      - 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'
-        more:
-          - 'add_header X-ansible-default 1;'
+        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'
+
+    nginx_php: "{{ [{'upstream_name': 'manual', 'sockets': [{'host': '127.0.0.1', 'port': '9636' }] }] }}"
     nginx_dh_length: 1024
   roles:
     - ../../
@@ -186,143 +289,275 @@
 # --------------------------------
 # Apps
 # --------------------------------
-    - name: APT | Install web apps
-      apt: pkg={{ item }} state=present
-      with_items:
-        - nagios3
-        - backuppc
-    - name: SERVICE | Ensure backuppc is started
-      service: name=backuppc state=started
+    - name: INCLUDE_TASKS | Post_tasks related to OS version
+      include_tasks: "includes/post_{{ ansible_distribution }}.yml"
 
 # --------------------------------
 # Deploy index files
 # --------------------------------
     - name: -- Add PHP file --
-      copy: dest="{{ nginx_root }}/{{ item }}/public/index.php" content="<?php phpinfo();"
-      with_items: ['test-php.local', 'test-php-index.local']
+      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"
-      with_items: ['{{ nginx_root }}/test.local/public', '/var/tmp', '{{ nginx_root }}/test-htpasswd-all.local/public', '{{ nginx_root }}/test-ssl.local/public', '{{ nginx_root }}/test-ssl-predeployed.local/public']
+      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"
 
 # --------------------------------
-# Simple vhosts tests
+# Test custom facts
 # --------------------------------
-    - name: -- VERIFY VHOSTS --
-      command: "curl -H 'Host: {{ item.name if item.name is string else item.name[0] }}' http://127.0.0.1{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
-      with_items: nginx_vhosts
-      when: item.delete is undefined or not item.delete
+    - 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 --
-      command: "curl -H 'Host: test-php-index.local' http://127.0.0.1/phpinfo.php"
-      register: f
-      failed_when: f.stdout.find('403 Forbidden') == -1
+      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 VHOSTS --
-      command: "curl -H 'Host: {{ item.redirect_from[0] }}' http://127.0.0.1/"
-      with_items: nginx_vhosts
-      when: item.redirect_from is defined and (item.delete is undefined or not item.delete)
+
+    - 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
-      register: r
-      failed_when: r.stdout.find('301 Moved Permanently') == -1
 
 # --------------------------------
 # PHP
 # --------------------------------
-    - name: -- VERIFY PHP VHOSTS --
-      command: "curl -H 'Host: {{ item }}' http://127.0.0.1/"
+    - name: -- VERIFY PHP SITES --
+      uri:
+        url: "http://{{ item.name }}/"
+        return_content: yes
       register: p
-      changed_when: false
-      failed_when: p.stdout.find('PHP Version') == -1
-      with_items: ['test-php.local', 'test-php-index.local']
+      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 --
+      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 --
-      command: "curl -H 'Host: test-htpasswd.local' http://127.0.0.1/hello"
-      changed_when: false
-      register: authnone
-      failed_when: authnone.stdout.find('401 Authorization Required') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+
     - name: -- VERIFY AUTH BASIC FAIL --
-      command: "curl -u fail:fail -H 'Host: test-htpasswd.local' http://127.0.0.1/hello"
-      changed_when: false
-      register: authfail
-      failed_when: authfail.stdout.find('401 Authorization Required') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+        user: "fail"
+        password: "fail"
+        force_basic_auth: yes
+
     - name: -- VERIFY AUTH BASIC OK --
-      command: "curl -u hanx:qwerty -H 'Host: test-htpasswd.local' http://127.0.0.1/hello"
-      changed_when: false
-      register: authok
-      failed_when: authok.stdout.find('hello') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+
     - name: -- VERIFY AUTH BASIC FAIL GLOBAL --
-      command: "curl -u fail:fail -H 'Host: test-htpasswd-all.local' http://127.0.0.1/"
-      changed_when: false
-      register: authgfail
-      failed_when: authgfail.stdout.find('401 Authorization Required') == -1
-    - name: -- VERIFY AUTH BASIC OK --
-      command: "curl -u hanx:qwerty -H 'Host: test-htpasswd-all.local' http://127.0.0.1/"
-      changed_when: false
-      register: authgok
-      failed_when: authgok.stdout.find('401 Authorization Required') != -1
+      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 --
-      command: "curl -u hanx:qwerty -H 'Host: backuppc.local' http://127.0.0.1/"
-      changed_when: false
+      uri:
+        url: "http://backuppc.local/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+        return_content: yes
       register: authbpc
-      failed_when: authbpc.stdout.find('BackupPC Server Status') == -1
-
-# --------------------------------
-# Nagios
-# --------------------------------
-    - name: -- VERIFY NAGIOS3 PHP --
-      command: "curl -u nagiosadmin:nagios -H 'Host: nagios3.local' http://127.0.0.1/side.php"
-      changed_when: false
-      register: nagios_php
-      failed_when: nagios_php.stdout.find('Nagios Core') == -1
-    - name: -- VERIFY NAGIOS3 CGI --
-      command: "curl -u nagiosadmin:nagios -H 'Host: nagios3.local' http://127.0.0.1/cgi-bin/nagios3/summary.cgi"
-      changed_when: false
-      register: nagios_cgi
-      failed_when: nagios_cgi.stdout.find('Nagios Event Summary') == -1
+      when: ansible_distribution != 'FreeBSD'
+      failed_when: authbpc.content.find('BackupPC Server Status') == -1
 
 # --------------------------------
 # SSL
 # --------------------------------
     - name: -- VERIFY SSL --
-      command: "curl --insecure -H 'Host: {{ item }}' https://127.0.0.1/"
-      changed_when: false
+      uri:
+        url: "https://{{ item }}/"
+        return_content: yes
+        validate_certs: no
       register: sslok
-      failed_when: sslok.stdout.find('Index HTML test OK') == -1
-      with_items:
+      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 vhosts
+# Default sites
 # --------------------------------
-    - name: -- VERIFY DEFAULT VHOST --
-      command: "curl -v http://127.0.0.1/"
-      changed_when: false
+    - name: -- VERIFY DEFAULT SITE --
+      uri:
+        url: 'http://127.0.0.1/'
+        return_content: yes
       register: vdefault
       failed_when: >
-        vdefault.stdout.find('Index HTML test OK') == -1 or
-        vdefault.stderr.find('X-ansible-default') == -1
-    - name: -- VERIFY DEFAULT SSL VHOST --
-      command: "curl --insecure -v https://127.0.0.1/"
-      changed_when: false
-      register: defaultssl
+        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: >
-        defaultssl.stdout.find('Index HTML test OK') == -1 or
-        defaultssl.stderr.find('X-ansible-default') == -1
-    - name: -- VERIFY NOT DEFAULT VHOST --
-      command: "curl -v -H 'Host: test-php.local' http://127.0.0.1/"
-      changed_when: false
+        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.stderr.find('X-ansible-default') != -1
-    - name: -- VERIFY NOT DEFAULT SSL VHOST --
-      command: "curl --insecure -v -H 'Host: test-ssl.local' https://127.0.0.1/"
-      changed_when: false
+      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.stderr.find('X-ansible-default') != -1
+      failed_when: notdefaultssl.x_ansible_default is defined
+
+
+# --------------------------------
+# Check Proxy protocol
+# --------------------------------
+
+# Note: Debian Stretch doesn't any version of curl with "--haproxy-protocol" argument
+
+    - block:
+
+      - name: SHELL | Check HTTP proxy protocol
+        shell: curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
+        args:
+          executable: /bin/sh
+          warn: no
+        changed_when: false
+        tags:
+          - skip_ansible_lint
+
+      - name: SHELL | Check HTTPS proxy protocol
+        shell: curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
+        args:
+          executable: /bin/sh
+          warn: no
+        changed_when: false
+        tags:
+          - skip_ansible_lint
+
+      when: not (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', 'eq'))
+
+# --------------------------------
+# 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

@@ -0,0 +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

@@ -0,0 +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

@@ -23,11 +23,29 @@ nginx_upstream_server_params:
 #    min_version: '1.5.12'
 
 nginx_dirs:
-  - "{{ nginx_htpasswd_dir }}"
-  - "{{ nginx_ssl_dir }}"
-  - "{{ nginx_helper_dir }}"
+  - dir: "{{ nginx_htpasswd_dir }}"
+    mode: "0750"
+    owner: "{{ nginx_user }}"
+  - dir: "{{ nginx_ssl_dir }}"
+    mode: "0750"
+    owner: "root"
+  - dir: "{{ nginx_helper_dir }}"
+    mode: "0755"
+    owner: "root"
+  - dir: "{{ nginx_etc_dir }}/modules-available"
+    mode: "0755"
+    owner: "root"
+  - dir: "{{ nginx_etc_dir }}/modules-enabled"
+    mode: "0755"
+    owner: "root"
 
 nginx_templates_no_dir:
-  - '_proxy'
-  - '_nagios3'
   - '_backuppc'
+  - '_proxy'
+
+nginx_servers_default_headers:
+  'X-Frame-Options': 'DENY always'
+  'X-Content-Type-Options': 'nosniff always'
+  'X-XSS-Protection': '1; mode=block always'
+
+nginx_acmesh_bin: "{{ nginx_acmesh_dir }}/acme.sh"