Skip tests on proxy protocol on Debian Stretch

- 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,11 +1,12 @@
 env:
   - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.6,<2.7'
   - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.6,<2.7'
   - PLATFORM='docker-debian-stretch'          ANSIBLE_VERSION='ansible>=2.7,<2.8'
-  - PLATFORM='docker-debian-stretch-sury'     ANSIBLE_VERSION='ansible>=2.7,<2.8'
   - PLATFORM='docker-debian-buster'           ANSIBLE_VERSION='ansible>=2.7,<2.8'
-
+  - 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
@@ -26,6 +27,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

@@ -105,6 +105,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,20 +6,18 @@
 Vagrant.configure("2") do |config|
 
   vms_debian = [
-    { :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 }},
-    { :name => "debian-buster", :box => "debian/buster64", :vars => { "nginx_php": [{"version": "7.3"}] }}
+    { :name => "debian-stretch", :box => "debian/stretch64", :vars => {} },
+    { :name => "debian-buster", :box => "debian/buster64", :vars => {} }
   ]
 
   vms_freebsd = [
-    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE",  :vars => {} },
-    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} },
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} }
   ]
 
   conts = [
-    { :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 }},
-    { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => { "nginx_php": [{"version": "7.3"}] }},
+    { :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"
@@ -66,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

@@ -84,6 +84,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
 #
@@ -115,7 +127,7 @@ nginx_load_modules: []
 #
 nginx_dh: null
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
-nginx_dh_length: 4096
+nginx_dh_length: 2048
 
 #
 # acme.sh

doc/php.md

@@ -2,8 +2,7 @@ PHP
 ===
 
 `nginx_php`:
-  - `version`: (M) PHP version
-  - `upstream_name` (O)
+  - `upstream_name` (M)
   - `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`
-- `port`
-- `weight`
-- `max_fails`
-- `fail_timeout`
+- `host` (M)
+- `port` (M)
+- `weight` (O)
+- `max_fails` (O)
+- `fail_timeout` (O)

doc/site.md

@@ -29,9 +29,8 @@ 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)
-- `http_proxy_protocol_port` (O) Enable proxy protocol on http port.
-- `https_proxy_protocol_port` (O) Enable proxy protocol on https port.
+- `listen_proxy_protocol` (O) Enable proxy protocol on http port.
+- `listen_proxy_protocol_ssl` (O) Enable proxy protocol on https port.
 
 (O): Optional
 (M): Mandatory

filter_plugins/nginx.py

@@ -10,11 +10,54 @@ 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 pair.has_key('dest_key'):
+        return pair['dest_key']
+    else:
+        return nginx_ssl_dir(pair, ssl_dir) + '/' + nginx_site_filename(pair) + '.key'
+
+def nginx_cert_path(pair, ssl_dir):
+    if pair.has_key('dest_cert'):
+        return pair['dest_cert']
+    else:
+        return nginx_ssl_dir(pair, ssl_dir) + '/' + nginx_site_filename(pair) + '.crt'
+
+def nginx_all_site_names(site):
+    all_sites = []
+    if isinstance(site['name'], list):
+        all_sites = all_sites + site['name']
+    else:
+        all_sites.append(site['name'])
+
+    if site.has_key('redirect_from'):
+        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):
+    res = None
+    for site in sites:
+        if site.has_key('ssl_name') and site['ssl_name'] == 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,17 +1,5 @@
 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
+    return '/run/php/php%s-fpm.sock' % php_version
 
 class FilterModule(object):
     ''' PHP module '''
@@ -19,7 +7,4 @@ class FilterModule(object):
     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
         }

meta/main.yml

@@ -26,4 +26,3 @@ galaxy_info:
   - nginx
   - cdn
 dependencies: []
-

tasks/install_Debian.yml

@@ -11,17 +11,9 @@
     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
@@ -50,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
-    shell: ./acme.sh --install --home "{{ nginx_acmesh_dir }}"
+  - 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/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:

tasks/site.yml

@@ -75,7 +75,7 @@
 
 - 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
   loop: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']

tasks/ssl/acme.yml

@@ -1,12 +1,12 @@
 ---
 
-- 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) }}"
   loop: "{{ nginx_ssl_pairs }}"
   when: item.acme is defined and item.acme
   register: acme_installed_certs
@@ -15,7 +15,7 @@
   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
+  when: item.skipped is not defined and (not item.stat.exists or item.stat.size == 0)
 
 - name: BLOCK | Start acme
   block:
@@ -46,10 +46,15 @@
       warn: false
     when: fake_site.changed and ansible_virtualization_type == 'docker'
 
-  - name: SHELL | Get certificates
-    shell: '{{ nginx_acmesh_bin }} --home {{ nginx_acmesh_dir }} --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 %}'
+  - 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 }}/{{ item | nginx_site_name }}.key"
+      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
@@ -60,22 +65,22 @@
       path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}"
     loop: "{{ acme_create }}"
 
-  - name: SHELL | Install certificates
-    shell: '{{ nginx_acmesh_bin }} --home {{ nginx_acmesh_dir }} --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"'
+  - 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: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
+      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: FILE | Delete acme.sh files
-    file:
-      path: "{{ nginx_acmesh_dir }}/{{ item | nginx_site_name }}/"
-      state: absent
-    loop: "{{ nginx_ssl_pairs }}"
-
   - name: FAIL | Explicit
     fail:
       msg: "Something is bad... Auto crash!"

tasks/ssl/standard.yml

@@ -30,7 +30,7 @@
 
 - name: FILE | Create SSL directories
   file:
-    path: "{{ nginx_ssl_dir + '/' + item | nginx_site_name }}"
+    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
@@ -39,7 +39,7 @@
 - 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
   loop: "{{ nginx_ssl_pairs }}"
   when: item.key is defined
@@ -49,7 +49,7 @@
 - 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
   loop: "{{ nginx_ssl_pairs }}"
   when: item.cert is defined
@@ -57,10 +57,15 @@
   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 }}"
-    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 %}"
+    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

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"

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

@@ -1,8 +1,16 @@
-server {
-	listen {{ item.acme_port | default('80') }};
-	listen [::]:{{ item.acme_port | default('80') }};
+{% 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_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/sites-available/_base.j2

@@ -1,15 +1,18 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item | nginx_site_filename %}
-{% set __listen = item.listen | default(['80', '[::]:80']) %}
-{% set __listen_ssl = item.listen_ssl | default(['443', '[::]:443']) %}
-{% set __http_proxy_protocol_port = item.http_proxy_protocol_port | default([]) %}
-{% set __https_proxy_protocol_port = item.https_proxy_protocol_port | default([]) %}
+{% 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(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 %}
@@ -40,15 +43,18 @@
 {%- 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)) %}
-	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.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 }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+	listen {{ port }};
+{% endfor %}
+{% for port in __listen_proxy_protocol %}
+	listen {{ port }} proxy_protocol;
 {% endfor %}
 	server_name {{ server_name(name) }};
 	location / {
@@ -67,12 +73,18 @@ 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 %}
@@ -84,7 +96,7 @@ server {
 {% 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 %}
@@ -106,7 +118,7 @@ server {
 {% block template_headers %}
 	# --> Custom headers
 {% for key, value in __headers.iteritems() %}
-	add_header {{ key }} "{{ value }}";
+	add_header {{ key }} "{{ value | regex_replace('\s+always$', '') }}"{% if value | regex_search('\s+always$') %} always{% endif %};
 {% endfor %}
 	# <-- Custom headers
 {% endblock %}
@@ -140,7 +152,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;
 	}
@@ -182,18 +194,25 @@ server {
 #
 server {
 {% for port in __listen %}
-	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+	listen {{ port }};
 {% endfor %}
+{% 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 }}{% 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 %}
@@ -201,7 +220,7 @@ server {
 {% 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,16 +1,5 @@
 {% 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 %}
@@ -21,8 +10,7 @@
 
 {% block template_upstream_location %}
 	location ~ \.php$ {
-		# {{ php_info }}
-		fastcgi_pass {{ php_upstream }};
+		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 %}

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

@@ -2,8 +2,7 @@
 
 {% block template_upstream_location %}
 	location = /index.php {
-		# {{ php_info }}
-		fastcgi_pass {{ php_upstream }};
+		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 %}

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

@@ -6,8 +6,7 @@
 
 {% block template_upstream_location %}
 	location = /index.php {
-		# {{ php_info }}
-		fastcgi_pass {{ php_upstream }};
+		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 %}

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/pre_Debian.yml

@@ -6,24 +6,6 @@
     state: present
   when: nginx_backports
 
-- block:
-
-  - name: APT | Install apt-transport-https
-    apt:
-      pkg: apt-transport-https
-      update_cache: yes
-      cache_valid_time: 3600
-
-  - name: APT_KEY | Install GPG key
-    apt_key:
-      url: 'https://packages.sury.org/php/apt.gpg'
-
-  - name: APT_REPOSITORY | Add APT repository
-    apt_repository:
-      repo: 'deb https://packages.sury.org/php {{ ansible_distribution_release }} main'
-
-  when: sury | default(false)
-
 - name: APT | Install needed packages
   apt:
     pkg: "{{ packages }}"
@@ -44,12 +26,19 @@
 
 - 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 }}"
-  register: apt_php
+  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:
@@ -58,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:
@@ -78,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:
-      - /usr/local/libexec/nginx/ngx_http_geoip_module.so
+      - 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
@@ -22,16 +30,16 @@
       - curl
       - daemonize
       - fcgiwrap
-      - GeoIP
+#     - GeoIP
       - jq
       - nghttp2
-      - php72
+      - php74
       - vim
 
-- name: COMMAND | Get geoip database
-  command: geoipupdate.sh
-  args:
-    creates: /usr/local/share/GeoIP/GeoIP.dat
+#- name: COMMAND | Get geoip database
+#  command: geoipupdate.sh
+#  args:
+#    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,6 +2,7 @@
 
 - hosts: all
   pre_tasks:
+
     - name: INCLUDE_TASKS | Pre_tasks related to OS version
       include_tasks: "includes/pre_{{ ansible_distribution }}.yml"
 
@@ -23,10 +24,20 @@
         src: "file/test.key"
         dest: "{{ int_ansible_ssl_dir }}/test.key"
 
-    - name: LINEINFILE | Add all hosts in /etc/hosts
-      lineinfile:
-        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 %}"
-        regexp: '^127\.0\.0\.1'
+    - 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
 
@@ -67,10 +78,8 @@
     nginx_acmesh: true
     nginx_acmesh_test: true
     nginx_ssl_pairs:
-      - name:
-          - '{{ ngrok.stdout }}'
+      - name: '{{ ngrok.stdout }}'
         acme: true
-        acme_port: 8888
       - name: 'test-ssl-selfsigned.local'
         self_signed: true
         force: false
@@ -135,7 +144,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 +153,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'
@@ -193,7 +202,7 @@
           - '/'
           - '/a'
       - 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:
@@ -203,8 +212,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
@@ -222,7 +233,9 @@
       - 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'
       - name: 'test-ssl-predeployed.local'
@@ -250,18 +263,22 @@
           - 'www.test-ssl-redirect-many2.local'
       - name: 'test-ssl-proxy-protocol.local'
         proto: ['http', 'https']
-        listen: [80, 20080]
-        listen_ssl: [443, 20443]
-        http_proxy_protocol_port: [20080]
-        https_proxy_protocol_port: [20443]
+        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:
     - ../../
@@ -355,14 +372,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:
@@ -501,6 +518,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
 # --------------------------------
@@ -510,3 +556,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"