Compat python3

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

.gitignore

@@ -2,3 +2,4 @@
 *.swp
 *.retry
 *.pyc
+/tests/HanXHX.php

.travis.yml

@@ -1,20 +1,12 @@
 env:
-  - PLATFORM='docker-debian-jessie'           ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-debian-jessie-backports' ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-debian-jessie-dotdeb'    ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-debian-jessie'           ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-debian-jessie-backports' ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-debian-jessie-dotdeb'    ANSIBLE_VERSION='ansible>=2.6,<2.7'
   - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-debian-jessie'           ANSIBLE_VERSION='ansible>=2.7,<2.8'
-  - PLATFORM='docker-debian-jessie-backports' ANSIBLE_VERSION='ansible>=2.7,<2.8'
-  - PLATFORM='docker-debian-jessie-dotdeb'    ANSIBLE_VERSION='ansible>=2.7,<2.8'
   - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.7,<2.8'
-  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.7,<2.8'
-
+  - 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
@@ -24,6 +16,9 @@ sudo: required
 dist: trusty
 
 language: python
+python:
+  - 2.7
+  - 3.6
 
 services:
   - docker
@@ -34,6 +29,7 @@ before_install:
 
 install:
   - pip install "$ANSIBLE_VERSION"
+  - ansible-galaxy install -p ./tests HanXHX.php,master
 
 script:
   - VAGRANT_DEFAULT_PROVIDER=docker vagrant up $PLATFORM

README.md

@@ -22,15 +22,16 @@ Supported OS:
 
 | OS                 | Working | Stable (active support) |
 | ------------------ | ------- | ----------------------- |
-| Debian Jessie (8)  | Yes     | Yes                     |
+| 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
 ------------
 
-Ansible 2.5+. 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
 --------------
@@ -54,6 +55,7 @@ FreeBSD:
 - `nginx_error_log_level`: default log level
 - `nginx_auto_config_httpv2`: boolean, auto configure HTTP2 where possible
 - `nginx_fastcgi_fix_realpath`: boolean, use realpath for fastcgi (fix problems with symlinks and PHP opcache)
+- `nginx_default_hsts`: string, default header sent for HSTS
 
 ### Nginx Configuration
 
@@ -104,6 +106,16 @@ 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
 ----------------
 

Vagrantfile

@@ -6,24 +6,18 @@
 Vagrant.configure("2") do |config|
 
   vms_debian = [
-    { :name => "debian-jessie", :box => "debian/jessie64", :vars => { "nginx_php": [{"version": "5.6"}] }},
+    { :name => "debian-stretch", :box => "debian/stretch64", :vars => {} },
-    { :name => "debian-jessie-backports", :box => "debian/jessie64", :vars => { "nginx_php": [{"version": "5.6"}], "nginx_backports": true }},
+    { :name => "debian-buster", :box => "debian/buster64", :vars => {} }
-    { :name => "debian-jessie-dotdeb", :box => "debian/jessie64", :vars => { "nginx_php": [{"version": "7.0"}, {"version": "5.6", "upstream_name": "legacy"} ], "dotdeb": true }},
-    { :name => "debian-stretch", :box => "debian/stretch64", :vars => { "nginx_php": [{"version": "7.0"}] }},
-    { :name => "debian-stretch-sury", :box => "debian/stretch64", :vars => { "nginx_php": [{"version": "7.1"}], "sury": true }}
   ]
 
   vms_freebsd = [
-    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE",  :vars => {} },
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} },
-    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} }
   ]
 
   conts = [
-    { :name => "docker-debian-jessie", :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "nginx_php" => [{"version" => "5.6"}] }},
+    { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => {} },
-    { :name => "docker-debian-jessie-backports", :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "nginx_php": [{"version": "5.6"}], "nginx_backports": true }},
+    { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => {} },
-    { :name => "docker-debian-jessie-dotdeb", :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "nginx_php": [{"version": "7.0"}, {"version": "5.6", "upstream_name": "legacy"} ], "dotdeb": true }},
-    { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "nginx_php": [{"version": "7.0"}] }},
-    { :name => "docker-debian-stretch-sury", :docker => "hanxhx/vagrant-ansible:debian9", :vars => { "nginx_php": [{"version": "7.1"}], "sury": true }}
   ]
 
   config.vm.network "private_network", type: "dhcp"
@@ -40,7 +34,7 @@ Vagrant.configure("2") do |config|
         ansible.playbook = "tests/test.yml"
         ansible.verbose = 'vv'
         ansible.become = true
-        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true })
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true, is_docker: true })
       end
     end
   end
@@ -70,7 +64,7 @@ Vagrant.configure("2") do |config|
         v.cpus = 2
         v.memory = 512
       end
-      m.vm.provision "shell", inline: "pkg install -y python bash"
+      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'

defaults/main.yml

@@ -19,6 +19,7 @@ nginx_auto_config_httpv2: true
 nginx_default_site: null
 nginx_default_site_ssl: null
 nginx_fastcgi_fix_realpath: true
+nginx_default_hsts: 'max-age=63072000; includeSubDomains'
 
 #
 # Nginx directories
@@ -84,6 +85,18 @@ nginx_http_gzip_disable: '"msie6"'
 #
 nginx_custom_http: []
 
+#
+# Nginx default
+#
+nginx_default_listen:
+  - '80'
+  - '[::]:80'
+nginx_default_listen_ssl:
+  - '443'
+  - '[::]:443'
+nginx_default_listen_proxy_protocol: []
+nginx_default_listen_proxy_protocol_ssl: []
+
 #
 # Sites
 #

doc/auth.md

@@ -1,11 +1,6 @@
 Auth Basic management
 =====================
 
-IMPORTANT
----------
-
-If you use this feature with Debian Stretch, you *MUST* use ansible >= 2.3.2! See: [https://github.com/HanXHX/ansible-nginx/issues/28](#28).
-
 Description
 -----------
 

doc/php.md

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

doc/site.md

@@ -19,6 +19,8 @@ Common
 - `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
@@ -27,9 +29,9 @@ Common
 - `proto`: (O) list of protocol used. Default is a list with "http". If you need http and https, you must set a list with "http" and "https". You can only set "https" without http support.
 - `ssl_name`: (D) name of the key used when using TLS/SSL. Optional when `proto` contains "https". If you don't set this value, it will search by `name`.
 - `ssl_template` (O) "strong" (default) or "legacy". You can disable SSL helpers and add your own directives by setting "false".
-- `php_version` (O) Sepecify PHP version (5 or 7)
+- `listen_proxy_protocol` (O) Enable proxy protocol on http port.
-- `http_proxy_protocol_port` (O) Enable proxy protocol on http port.
+- `listen_proxy_protocol_ssl` (O) Enable proxy protocol on https port.
-- `https_proxy_protocol_port` (O) Enable proxy protocol on https port.
+- `hsts` (O) overwrite default header for hsts
 
 (O): Optional
 (M): Mandatory
@@ -39,7 +41,7 @@ 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
 - `_phalcon`: Phalcon PHP Framework

doc/upstream.md

@@ -3,8 +3,6 @@ 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
 ---------------
 

filter_plugins/nginx.py

@@ -1,5 +1,5 @@
 def nginx_site_filename(site):
-    if site.has_key('filename'):
+    if 'filename' in site:
         return site['filename']
     else:
         return nginx_site_name(site)
@@ -10,11 +10,59 @@ def nginx_site_name(site):
     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_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

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

handlers/main.yml

@@ -26,10 +26,14 @@
 
 - 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

meta/main.yml

@@ -4,12 +4,12 @@ galaxy_info:
   description: Nginx for Debian / FreeBSD
   company:
   license: GPLv2
-  min_ansible_version: 2.5
+  min_ansible_version: 2.6
   platforms:
   - name: Debian
     versions:
-    - jessie
     - stretch
+    - buster
   - name: FreeBSD
     versions:
     - 11.0
@@ -26,4 +26,3 @@ galaxy_info:
   - nginx
   - cdn
 dependencies: []
-

tasks/htpasswd.yml

@@ -4,7 +4,7 @@
   file:
     path: "{{ nginx_htpasswd_dir }}/{{ item.name }}"
     state: absent
-  with_items: "{{ nginx_htpasswd }}"
+  loop: "{{ nginx_htpasswd }}"
   when: item.state is defined and item.state == 'absent'
   no_log: not nginx_debug_role
 
@@ -12,10 +12,7 @@
   htpasswd:
     name: "{{ item.1.name }}"
     password: "{{ item.1.password }}"
-    state: "{{ item.1.state | default('present') }}"
     path: "{{ nginx_htpasswd_dir }}/{{ item.0.name }}"
-  with_subelements:
+  loop: "{{ nginx_htpasswd | subelements('users') }}"
-    - "{{ nginx_htpasswd }}"
-    - users
   when: item.0.state is not defined or item.0.state == 'present'
   no_log: not nginx_debug_role

tasks/install_Debian.yml

@@ -1,35 +1,29 @@
 ---
 
+- 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 | Force OpenSSL from backports (fix dependency break)
-  apt:
-    pkg: openssl
-    state: latest
-    default_release: "{{ ansible_distribution_release + '-backports' }}"
-  when: nginx_backports
-
 - name: APT | Install nginx and dependencies
   apt:
     pkg: "{{ nginx_apt_package }}"
-    state: present
     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
-  when:
-    ansible_distribution_major_version is version('9', 'ge') or
-    nginx_backports
 
 - name: APT | Install python-passlib
   apt:
-    pkg: python-passlib
+    pkg: "python{% if ansible_python_version is version('3', '>=') %}3{% endif %}-passlib"
     state: present
 
 - name: STAT | Check acme.sh is installed
@@ -48,11 +42,13 @@
       repo: 'https://github.com/Neilpang/acme.sh.git'
       dest: '{{ nginx_acmesh_git_dir }}'
       update: no
+      version: master
 
-  - name: SHELL | Install acme.sh
+  - name: COMMAND | Install acme.sh
-    shell: ./acme.sh --install --home {{ nginx_acmesh_dir }} --cert-home {{ nginx_acmesh_dir }}
+    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

@@ -4,7 +4,7 @@
   pkgng:
     name: "{{ item }}"
     state: present
-  with_items:
+  loop:
     - acme.sh
     - "{{ nginx_pkgng_package }}"
     - py27-passlib
@@ -40,7 +40,7 @@
   file:
     path: "{{ nginx_etc_dir }}/{{ item }}"
     state: directory
-  with_items:
+  loop:
     - conf.d
     - sites-available
     - sites-enabled

tasks/main.yml

@@ -4,27 +4,27 @@
   include_vars: "{{ ansible_distribution }}.yml"
   tags: ['nginx::site', 'nginx::ssl']
 
-- name: INCLUDE | Install
+- name: INCLUDE_TASKS | Install
-  include: "install_{{ ansible_distribution }}.yml"
+  include_tasks: "install_{{ ansible_distribution }}.yml"
   tags: ['nginx::site', 'nginx::ssl']
 
-- name: INCLUDE | Prepare
+- name: IMPORT_TASKS| Prepare
-  include: prepare.yml
+  import_tasks: prepare.yml
   tags: ['nginx::site', 'nginx::ssl']
 
-- name: INCLUDE | Install
+- name: IMPORT_TASKS| Install
-  include: config.yml
+  import_tasks: config.yml
 
-- name: INCLUDE | Upstream configuration
+- name: IMPORT_TASKS| Upstream configuration
-  include: upstream.yml
+  import_tasks: upstream.yml
 
-- name: INCLUDE | htpasswd configuration
+- name: IMPORT_TASKS| htpasswd configuration
-  include: htpasswd.yml
+  import_tasks: htpasswd.yml
 
-- name: INCLUDE | SSL configuration
+- name: IMPORT_TASKS| SSL configuration
-  include: ssl/main.yml
+  import_tasks: ssl/main.yml
   tags: ['nginx::ssl']
 
-- name: INCLUDE | Sites configuration
+- name: IMPORT_TASKS| Sites configuration
-  include: site.yml
+  import_tasks: site.yml
   tags: ['nginx::site']

tasks/prepare.yml

@@ -7,14 +7,24 @@
   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//g; s/\s+//g' | sort
+  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:
@@ -26,7 +36,7 @@
     owner: "{{ item.owner }}"
     mode: "{{ item.mode }}"
     state: directory
-  with_items: "{{ nginx_dirs }}"
+  loop: "{{ nginx_dirs }}"
 
 - name: FILE | Create ansible facts dir
   file:

tasks/site.yml

@@ -4,7 +4,7 @@
   fail:
     msg: "Forbidden keyword default on site {{ item | nginx_site_name }}"
   when: item.filename is defined and item.filename == 'default'
-  with_items: "{{ nginx_sites }}"
+  loop: "{{ nginx_sites }}"
   loop_control:
     label: "{{ item | nginx_site_name }}"
 
@@ -14,7 +14,7 @@
   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)
-  with_items: "{{ nginx_sites }}"
+  loop: "{{ nginx_sites }}"
   loop_control:
     label: "{{ item | nginx_site_name }}"
 
@@ -53,11 +53,11 @@
   file:
     path: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
     state: absent
-  with_nested:
+  loop: "{{ nginx_sites | product(dirs) | list }}"
-    - "{{ nginx_sites }}"
-    - ['sites-available', 'sites-enabled']
   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 }}"
 
@@ -66,7 +66,7 @@
     src: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
     dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
     state: link
-  with_items: "{{ nginx_sites }}"
+  loop: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: >
     item.state is not defined or item.state == 'present'
@@ -75,9 +75,9 @@
 
 - name: FILE | Disable sites
   file:
-    path: "{{ nginx_etc_dir}}/sites-enabled/{{ item | nginx_site_filename }}"
+    path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
     state: absent
-  with_items: "{{ nginx_sites }}"
+  loop: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: item.state is defined and item.state == 'disabled'
   loop_control:

tasks/ssl/acme.yml

@@ -1,72 +1,98 @@
 ---
 
-- name: SET_FACT | Assign default..
+- name: SET_FACT | Assign default...
   set_fact:
     acme_create: []
 
 - name: STAT | Check if certificates are already installed
   stat:
-    path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.crt"
+    path: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
-  with_items: "{{ nginx_ssl_pairs }}"
+  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) ] }}"
-  with_items: "{{ acme_installed_certs.results }}"
+  loop: "{{ acme_installed_certs.results }}"
-  when: item.skipped is not defined and not item.stat.exists
+  when: item.skipped is not defined and (not item.stat.exists or item.stat.size == 0)
 
-- name: TEMPLATE | Create fake site
+- 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"
-  with_items: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
     register: fake_site
 
-- name: FILE | Delete current site if needed
+  - name: FILE | Delete current site if needed
     file:
       path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_name }}"
       state: absent
-  with_items: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
     when: fake_site.changed
 
-- name: SERVICE | Restart nginx
+  - name: SERVICE | Restart nginx
     service:
       name: nginx
       state: restarted
     when: fake_site.changed and ansible_virtualization_type != 'docker'
 
-- name: COMMAND | Restart nginx
+  - name: COMMAND | Restart nginx
     command: service nginx restart
     args:
       warn: false
     when: fake_site.changed and ansible_virtualization_type == 'docker'
 
-- name: SHELL | Get certificates
+  - name: COMMAND | Get certificates
-  shell: '{{ nginx_acmesh_bin }} --issue{% if item.name is string %} -d {{ item.name }}{% else %}{% for name in item.name %} -d {{ name }}{% endfor %}{% endif %} --nginx {% if nginx_acmesh_test %}--test{% endif %}'
+    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: "/root/.acme.sh/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
+      creates: "{{ nginx_acmesh_dir }}/{{ item | nginx_site_name }}/fullchain.cer"
-  with_items: "{{ acme_create }}"
+    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
+  - name: FILE | Create SSL dir per site
     file:
       path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}"
-  with_items: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
 
-- name: SHELL | Install certificates
+  - name: COMMAND | Install certificates
-  shell: '{{ nginx_acmesh_bin }} --install-cert -d {{ item | nginx_site_name }} --fullchain-file {{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.crt --key-file {{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key --reloadcmd "service nginx restart"'
+    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: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
+      creates: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
-  with_items: "{{ nginx_ssl_pairs }}"
+    loop: "{{ nginx_ssl_pairs }}"
     when: item.acme is defined and item.acme
     notify: restart nginx
 
-- name: FILE | Delete fake sites
+  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
-  with_items: "{{ acme_create }}"
+    loop: "{{ acme_create }}"
+    notify: restart nginx
+
+  - name: META | Flush handlers
+    meta: flush_handlers

tasks/ssl/main.yml

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

tasks/ssl/standard.yml

@@ -1,13 +1,25 @@
 ---
 
-- name: COMMAND | Generate DH file
+- 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 }}
-  args:
+    when: not stat_dh_file.stat.exists or (dh_info.stdout | int != nginx_dh_length | int)
-    creates: "{{ nginx_dh_path }}"
-  when: nginx_dh is not string
     notify: restart nginx
-  async: 1000
+
-  register: dh
+  when: nginx_dh is not string
 
 - name: COPY | Deploy DH file from vars
   copy:
@@ -18,18 +30,18 @@
 
 - name: FILE | Create SSL directories
   file:
-    path: "{{ nginx_ssl_dir + '/' + item | nginx_site_name }}"
+    path: "{{ item | nginx_ssl_dir(nginx_ssl_dir) }}"
     state: directory
-  with_items: "{{ nginx_ssl_pairs }}"
+  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: "{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.key' if item.dest_key is not defined else item.dest_key }}"
+    dest: "{{ item | nginx_key_path(nginx_ssl_dir) }}"
     mode: 0640
-  with_items: "{{ nginx_ssl_pairs }}"
+  loop: "{{ nginx_ssl_pairs }}"
   when: item.key is defined
   notify: restart nginx
   no_log: not nginx_debug_role
@@ -37,27 +49,24 @@
 - name: COPY | Deploy SSL certs
   copy:
     content: "{{ item.cert }}"
-    dest: "{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
+    dest: "{{ item | nginx_cert_path(nginx_ssl_dir) }}"
     mode: 0644
-  with_items: "{{ nginx_ssl_pairs }}"
+  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_site_name + '.key' }} -out {{ item | nginx_site_name + '.crt' }}"
+  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: "{{ nginx_ssl_dir + '/' + item | nginx_site_name }}"
+    chdir: "{{ item | nginx_ssl_dir(nginx_ssl_dir) }}"
-    creates: "{% if item.force is defined and item.force %}/tmp/dummy{% else %}{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.crt' }}{% endif %}"
+    creates: "{{ '/tmp/dummy' if item.force is defined and item.force else item | nginx_cert_path(nginx_ssl_dir) }}"
-  with_items: "{{ nginx_ssl_pairs }}"
+  loop: "{{ nginx_ssl_pairs }}"
   when: item.self_signed is defined
   notify: restart nginx
   no_log: not nginx_debug_role
-
-- name: Check DH command status
-  async_status:
-    jid: "{{ dh.ansible_job_id }}"
-  register: job_result
-  until: job_result.finished
-  retries: 30
-  when: not ansible_check_mode and nginx_dh is not string

tasks/upstream.yml

@@ -4,15 +4,8 @@
   template:
     src: "etc/nginx/conf.d/php.conf.j2"
     dest: "{{ nginx_etc_dir }}/conf.d/php.conf"
-  when: nginx_php | length > 0
   notify: reload nginx
 
-- name: FILE | Delete PHP upstream
-  file:
-    path: "{{ nginx_etc_dir }}/conf.d/php.conf"
-    state: absent
-  when: nginx_php | length == 0
-
 - name: TEMPLATE | Deploy other upstreams
   template:
     src: "etc/nginx/conf.d/_upstream.conf.j2"
@@ -25,6 +18,6 @@
   file:
     path: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
     state: absent
-  with_items: "{{ nginx_upstreams }}"
+  loop: "{{ nginx_upstreams }}"
   when: item.state is defined and item.state == 'absent'
   notify: reload nginx

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

@@ -1,8 +1,16 @@
-server {
+{% set site = nginx_sites | nginx_search_by_ssl_name(item.name) %}
-	listen {{ item.acme_port | default('80') }};
+{% set __listen = item.listen | default(nginx_default_listen) %}
-	listen [::]:{{ item.acme_port | default('80') }};
+{% set __listen_proxy_protocol = item.listen_proxy_protocol | default(nginx_default_listen_proxy_protocol) %}
 
-	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(" ") }}{% endif %}{% if item.redirect_from is defined %} {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ item.redirect_from | join(" ") }}{% endif %}{% endif %};
+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/php.conf.j2

@@ -3,18 +3,27 @@
 #
 
 {% for php in nginx_php %}
-upstream {{ php.upstream_name | default((php.version | php_default_upstream_name)) }} {
+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 | default((php.version | php_default_upstream_socket)) }} weight={{ sock.weight | default('1') }};
+    server unix:{{ sock.unix }} weight={{ sock.weight | default('1') }};
 {% endif %}
-{% else %}
-    server unix:{{ php.version | php_default_upstream_socket }} weight=1;
 {% endfor %}
 }
-
 {% endfor %}
 
+{% if ansible_local.hanxhx_php.fpm_pool is defined%}
+# -------------------------------------------------------
+# Auto-detected PHP config for HanXHX.php ansible role
+# -------------------------------------------------------
+
+{% for php in ansible_local.hanxhx_php.fpm_pool %}
+upstream {{ php.name }} {
+	server {% if php.listen.startswith('/') %}unix:{{ php.listen }}{% else %}{{ php.listen }}{% endif %};
+}
+{% endfor %}
+{% endif %}
+
 # vim:filetype=nginx

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

@@ -3,10 +3,10 @@
 #
 
 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 TLSv1.1 TLSv1.2{% if nginx_version.stdout is version('1.13.0', 'ge') %} TLSv1.3{% endif %};
+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"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
+ssl_session_tickets off;
 ssl_stapling on;
 ssl_stapling_verify on;
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};

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

@@ -2,11 +2,13 @@
 # {{ ansible_managed }}
 #
 
-ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
+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 TLSv1.1 TLSv1.2{% if nginx_version.stdout is version('1.13.0', 'ge') %} TLSv1.3{% endif %};
+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"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
+ssl_session_tickets off;
 ssl_stapling on;
 ssl_stapling_verify on;
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};

templates/etc/nginx/nginx.conf.j2

@@ -5,9 +5,7 @@
 user {{ nginx_user }};
 worker_processes {{ nginx_worker_processes }};
 pid {{ nginx_pid }};
-{% if nginx_version.stdout is version('1.9.11', 'ge') %}
 include {{ nginx_etc_dir }}/modules-enabled/*.conf;
-{% endif %}
 
 events {
 	worker_connections {{ nginx_events_worker_connections }};

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

@@ -1,13 +1,39 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item | nginx_site_filename %}
+{% set __main_name =  item | nginx_site_name %}
-{% set __listen = item.listen | default(['80', '[::]:80']) %}
+{% set __listen = item.listen | default(nginx_default_listen) %}
-{% set __listen_ssl = item.listen_ssl | default(['443', '[::]:443']) %}
+{% set __listen_ssl = item.listen_ssl | default(nginx_default_listen_ssl) %}
-{% set __http_proxy_protocol_port = item.http_proxy_protocol_port | default([]) %}
+{% set __listen_proxy_protocol = item.listen_proxy_protocol | default(nginx_default_listen_proxy_protocol) %}
-{% set __https_proxy_protocol_port = item.https_proxy_protocol_port | default([]) %}
+{% 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(item.name if item.name is string else item.name[0]) %}
+{% 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) -%}
 {%- if htpasswd_name != false %}
 {%- for ht in nginx_htpasswd if ht.name == htpasswd_name %}
@@ -17,17 +43,20 @@
 {%- endif %}
 {%- endmacro %}
 {% macro ssl(ssl_name) %}
-{% for sn in nginx_ssl_pairs if ((sn.name is string and sn.name == ssl_name) or (sn.name.0 == ssl_name)) %}
+{% for sn in nginx_ssl_pairs if (sn.name is defined and (sn | nginx_site_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 {{ sn | nginx_cert_path(nginx_ssl_dir) }};
-	ssl_certificate_key {{ nginx_ssl_dir + '/' + ssl_name + '/' + ssl_name + '.key' if sn.dest_key is not defined else sn.dest_key }};
+	ssl_certificate_key {{ sn | nginx_key_path(nginx_ssl_dir) }};
 {% endfor %}
 {%- endmacro %}
 {% macro httpsredirect(name) %}
 server {
 {% for port in __listen %}
-	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+	listen {{ port }};
 {% endfor %}
-	server_name {{ name }};
+{% 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;
 	}
@@ -44,24 +73,31 @@ server {
 server {
 {% if 'http' in __proto %}
 {% for port in __listen %}
-	listen {{ port }}{% if nginx_default_site == __main_name %} default_server{% endif %}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% 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_site_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if __http2 %} http2{% endif %};
+{% endfor %}
+{% for port in __listen_proxy_protocol_ssl %}
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if __http2 %} http2{% endif %} proxy_protocol;
 {% endfor %}
 {{ ssl(__ssl_name) }}
 {% if item.ssl_template is not defined or item.ssl_template != false %}
 	include {{ nginx_helper_dir + '/ssl-' + item.ssl_template | default('strong') }};
+	add_header Strict-Transport-Security "{{ item.hsts | default(nginx_default_hsts) }}" always;
 {% endif %}
 {% endif %}
-	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ "\n\t\t"  }}{{ item.name | join("\n\t\t") }}{% 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 %}
@@ -82,16 +118,18 @@ server {
 
 {% block template_headers %}
 	# --> Custom headers
-{% for key, value in __headers.iteritems() %}
+{% for key, value in __headers.items() %}
-	add_header {{ key }} "{{ value | replace(' always', '') }}"{% if nginx_version.stdout is version('1.7.5', 'ge') and ' always' in value %} always{% endif %};
+	add_header {{ key }} "{{ value | regex_replace('\s+always$', '') }}"{% if value | regex_search('\s+always$') %} always{% endif %};
 {% endfor %}
 	# <-- Custom headers
 {% endblock %}
 
-{% if not __location.has_key('/') %}
+{{ 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 %}
@@ -101,19 +139,7 @@ server {
 {% block template_custom_location %}
 {% endblock %}
 
-{% if __location_order | length > 0 %}
+{{ locations(__location, __location_order) }}
-	# --> Custom locations
-{% for location in __location_order %}
-	location {{ location }} {
-{% set opts = __location[location] %}
-{% for opt in opts %}
-{% if opt.htpasswd is defined %}{{ htpasswd(opt.htpasswd, 2) }}{% else %}
-		{{ opt }}
-{% endif %}
-{% endfor  %}
-	}
-{% endfor %}	# <-- Custom locations
-{% endif %}
 
 {% block template_local_content %}
 {% if item.manage_local_content is not defined or item.manage_local_content %}
@@ -127,7 +153,7 @@ 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;
 	}
@@ -169,26 +195,34 @@ server {
 #
 server {
 {% for port in __listen %}
-	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+	listen {{ port }};
 {% endfor %}
-	server_name {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ "\n\t\t" }}{{ item.redirect_from | join("\n\t\t") }}{% endif %};
+{% for port in __listen_proxy_protocol %}
+	listen {{ port }} proxy_protocol;
+{% endfor %}
+
+	server_name {{ server_name(item.redirect_from) }};
 	location / {
-		return 301 $scheme://{{ item.name if item.name is string else item.name[0] }}$request_uri;
+		return 301 $scheme://{{ __main_name }}$request_uri;
 	}
 }
 
 {% if 'https' in __proto %}
 server {
 {% for port in __listen_ssl %}
-	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
+	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 {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ "\n\t\t" }}{{ item.redirect_from | join("\n\t\t") }}{% endif %};
+	server_name {{ server_name(item.redirect_from) }};
 	location / {
-		return 301 https://{{ item.name if item.name is string else item.name[0] }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
+		return 301 https://{{ __main_name }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
 	}
 }
 {% endif %}

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

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

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

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

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

@@ -1,13 +1,12 @@
 {% extends "_php.j2" %}
 
 {% block template_try_files %}
-		try_files {{ override_try_files | default('$uri $uri/ /index.php') }};
+		try_files {{ item.override_try_files | default('$uri $uri/ /index.php') }};
 {% endblock %}
 
 {% block template_upstream_location %}
 	location = /index.php {
-		# {{ php_info }}
+		fastcgi_pass {{ item.php_upstream }};
-		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}

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

@@ -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 %}

tests/includes/post_Debian.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: APT | Install webapps
+- name: APT | Install webapps and related tools
   apt:
     pkg: "{{ packages }}"
     state: present
@@ -8,8 +8,12 @@
   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

@@ -2,10 +2,8 @@
 
 #- name: APT | Install web apps
 #  pkgng:
-#    pkg: "{{ item }}"
+#    name: "backuppc"
 #    state: present
-#  with_items:
-#    - backuppc
 #
 #- name: COMMAND | Activate backuppc config
 #  command: >

tests/includes/pre_Debian.yml

@@ -6,43 +6,6 @@
     state: present
   when: nginx_backports
 
-- block:
-
-  - name: APT | Install DotDeb key
-    apt_key:
-      url: 'http://www.dotdeb.org/dotdeb.gpg'
-      state: present
-
-  - name: APT_REPOSITORY | Install dotdeb (PHP 7)
-    apt_repository:
-      repo: 'deb http://packages.dotdeb.org {{ ansible_distribution_release }} all'
-      state: present
-
-  - name: LINEFILEFILE | Dotdeb priority (prevent install nginx from dotdeb)
-    copy:
-      content: "Package: *\nPin: release o=packages.dotdeb.org\nPin-Priority: 100"
-      dest: /etc/apt/preferences
-
-  when: ansible_distribution_release == 'jessie' and dotdeb | default(false)
-
-- block:
-
-  - name: APT | Install apt-transport-https
-    apt:
-      pkg: apt-transport-https
-      update_cache: yes
-      cache_valid_time: 3600
-
-  - name: APT_KEY | Install GPG key
-    apt_key:
-      url: 'https://packages.sury.org/php/apt.gpg'
-
-  - name: APT_REPOSITORY | Add APT repository
-    apt_repository:
-      repo: 'deb https://packages.sury.org/php {{ ansible_distribution_release }} main'
-
-  when: sury | default(false)
-
 - name: APT | Install needed packages
   apt:
     pkg: "{{ packages }}"
@@ -53,6 +16,7 @@
     packages:
       - cron
       - curl
+      - daemonize
       - fcgiwrap
       - jq
       - nghttp2
@@ -60,18 +24,21 @@
       - vim
       - unzip
 
-- name: APT | Install daemonize from Stretch
-  apt:
-    deb: http://ftp.us.debian.org/debian/pool/main/d/daemonize/daemonize_1.7.7-1+b1_amd64.deb
-
 - name: APT | Install PHP
   apt:
-    pkg: "{{ item.version | php_fpm_package }}"
+    pkg: "{{ pkgs }}"
     update_cache: yes
     cache_valid_time: 3600
     state: present
-  loop: "{{ nginx_php }}"
+  vars:
-  register: apt_php
+    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:
@@ -80,11 +47,10 @@
 
 # Bypasses Ansible+Docker issue. With service module... php is not really started!
 - name: COMMAND | Force start PHP
-  command: "service {{ item.version | php_fpm_service }} start"
+  command: "service php{{ cur_php_version.stdout }}-fpm start"
   args:
-    creates: "{{ item.version | php_default_upstream_socket }}"
+    creates: "/run/php/php{{ cur_php_version.stdout }}-fpm.pid"
     warn: false
-  loop: "{{ nginx_php }}"
 
 - name: GET_URL | Download ngrok
   get_url:
@@ -100,3 +66,24 @@
 - 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

@@ -5,12 +5,20 @@
     nginx_pkgng_package: 'nginx-full'
     nginx_user: 'www'
     nginx_php:
-      - version: '7.2'
+      - upstream_name: 'manual'
         sockets:
           - host: '127.0.0.1'
             port: 9000
-    nginx_load_modules:
+      - upstream_name: 'hx_unix'
-      - /usr/local/libexec/nginx/ngx_http_geoip_module.so
+        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
@@ -22,16 +30,16 @@
       - curl
       - daemonize
       - fcgiwrap
-      - GeoIP
+#     - GeoIP
       - jq
       - nghttp2
-      - php72
+      - php74
       - vim
 
-- name: COMMAND | Get geoip database
+#- name: COMMAND | Get geoip database
-  command: geoipupdate.sh
+#  command: geoipupdate.sh
-  args:
+#  args:
-    creates: /usr/local/share/GeoIP/GeoIP.dat
+#    creates: /usr/local/share/GeoIP/GeoIP.dat
 
 - name: SERVICE | Force start services
   service:

tests/includes/pre_common.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: SHELL | Start ngrok
-  shell: daemonize -l /tmp/ngrok.lock {{ ngrok_path }} http 8888 -bind-tls=false
+  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

tests/test.yml

@@ -2,11 +2,12 @@
 
 - hosts: all
   pre_tasks:
-    - name: INCLUDE | Pre_tasks related to OS version
-      include: "includes/pre_{{ ansible_distribution }}.yml"
 
-    - name: INCLUDE | Pre_tasks common
+    - name: INCLUDE_TASKS | Pre_tasks related to OS version
-      include: "includes/pre_common.yml"
+      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:
@@ -23,10 +24,20 @@
         src: "file/test.key"
         dest: "{{ int_ansible_ssl_dir }}/test.key"
 
-    - name: LINEINFILE | Add all hosts in /etc/hosts
+    - name: COPY | Add all hosts in /etc/hosts
-      lineinfile:
+      copy:
-        line: "127.0.0.1\tlocalhost {% for s in nginx_sites %}{% if s.name is string %}{{ s.name }}{% else %}{% for n in s.name %}{{ n }} {% endfor %}{% endif %} {% if s.redirect_from is defined %}{% for rf in s.redirect_from %}{{ rf }} {% endfor %}{% endif %}{% endfor %}"
+        content: |
-        regexp: '^127\.0\.0\.1'
+          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
 
@@ -67,14 +78,14 @@
     nginx_acmesh: true
     nginx_acmesh_test: true
     nginx_ssl_pairs:
-      - name:
+      - name: '{{ ngrok.stdout }}'
-          - '{{ ngrok.stdout }}'
         acme: true
-        acme_port: 8888
       - name: 'test-ssl-selfsigned.local'
         self_signed: true
         force: false
-      - name: 'test-ssl-predeployed.local'
+      - 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'
@@ -135,7 +146,7 @@
       - '    DZ no;'
       - '    TN no;'
       - '}'
-    nginx_default_site: 'first-test'
+    nginx_default_site: 'test.local'
     nginx_default_site_ssl: 'test-ssl-predeployed.local'
     nginx_sites:
       - name:
@@ -144,7 +155,7 @@
           - 'test2-alias.local'
         template: '_base'
         filename : 'first-test'
-        override_try_files: '$uri $uri index.htm index.html'
+        override_try_files: '$uri/ $uri =404'
         headers:
           'X-Frame-Options': 'deny always'
           'X-ansible-default': '1'
@@ -164,9 +175,10 @@
             - 'deny all;'
       - name: 'test-htpasswd.local'
         template: '_base'
-        location:
+        location_before:
           '/hello':
             - htpasswd: 'hello'
+        location:
           '/public':
             - htpasswd: false
         use_error_log: true
@@ -175,22 +187,24 @@
         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;'
-          '/b':
+        location_order_before:
-            - 'alias /var/tmp;'
+          - '/b'
-          '/c':
+          - '/c'
-            - 'alias /var/tmp;'
         location_order:
           - '/'
           - '/a'
-          - '/b'
-          - '/c'
       - name: 'test-php.local'
-        php_version: "{{ nginx_php.1.version if nginx_php.1 is defined else nginx_php.0.version }}"
+        php_upstream: "manual"
         upstream_params:
           - 'fastcgi_param FOO bar;'
         redirect_from:
@@ -200,8 +214,10 @@
         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
@@ -219,9 +235,12 @@
       - name: 'test-ssl.local'
         proto: ['http', 'https']
         template: '_base'
-      - name: 'test-ssl-selfsigned.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'
@@ -247,18 +266,22 @@
           - 'www.test-ssl-redirect-many2.local'
       - name: 'test-ssl-proxy-protocol.local'
         proto: ['http', 'https']
-        listen: [80, 20080]
+        listen_proxy_protocol: [20080]
-        listen_ssl: [443, 20443]
+        listen_proxy_protocol_ssl: [20443]
-        http_proxy_protocol_port: [20080]
-        https_proxy_protocol_port: [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:
     - ../../
@@ -266,8 +289,8 @@
 # --------------------------------
 # Apps
 # --------------------------------
-    - name: INCLUDE | Post_tasks related to OS version
+    - name: INCLUDE_TASKS | Post_tasks related to OS version
-      include: "includes/post_{{ ansible_distribution }}.yml"
+      include_tasks: "includes/post_{{ ansible_distribution }}.yml"
 
 # --------------------------------
 # Deploy index files
@@ -352,14 +375,14 @@
 # --------------------------------
     - name: -- VERIFY PHP SITES --
       uri:
-        url: "http://{{ item.name}}/"
+        url: "http://{{ item.name }}/"
         return_content: yes
       register: p
       loop: "{{ nginx_sites }}"
       when: >
         item.template is defined and
         (item.template == '_php' or item.template == '_php_index' or item.template == '_php_index2')
-      failed_when: p.content.find('PHP Version ' + item.php_version if 'php_version' in item else nginx_php.0.version) == -1
+      failed_when: p.content.find('PHP Version') == -1
 
     - name: -- VERIFY INDEX2 --
       uri:
@@ -498,6 +521,35 @@
       register: notdefaultssl
       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
 # --------------------------------
@@ -507,3 +559,5 @@
         executable: /bin/sh
       changed_when: false
       when: nginx_auto_config_httpv2 and 'http_v2' in nginx_modules
+      tags:
+        - skip_ansible_lint

vars/main.yml

@@ -46,6 +46,6 @@ nginx_templates_no_dir:
 nginx_servers_default_headers:
   'X-Frame-Options': 'DENY always'
   'X-Content-Type-Options': 'nosniff always'
-  'X-XSS-Protection': '1; mode=block'
+  'X-XSS-Protection': '1; mode=block always'
 
 nginx_acmesh_bin: "{{ nginx_acmesh_dir }}/acme.sh"