Fix deprecations (#35 )

* Drop Nagios support * Fix start PHP-FPM on Docker * Fix deprecations on Ansible 2.7 - with_ -> loop - fix filters as test - test version_compare -> version - set min_version to 2.5
Add Ansible 2.5 + 2.6 to travis
2026-02-28 09:22:10 +07:00 · 2019-01-24 11:05:46 +01:00 · 2018-10-03 14:09:20 +02:00 · 2018-04-20 09:32:46 +02:00 · 2018-04-20 09:20:39 +02:00 · 2018-03-22 20:35:51 +01:00
56 changed files with 1294 additions and 855 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vagrant*
 *.swp
 *.retry
+*.pyc
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,23 @@
+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-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'
+
+
 matrix:
-  include:
-    - env: PLATFORM=debian-jessie ORIGIN=debian    NGINX_PHP56=true NGINX_PHP70=false NGINX_BACKPORTS=false DOTDEB=false
-    - env: PLATFORM=debian-jessie ORIGIN=backports NGINX_PHP56=true NGINX_PHP70=false NGINX_BACKPORTS=true  DOTDEB=false
-    - env: PLATFORM=debian-jessie ORIGIN=dotdeb    NGINX_PHP56=true NGINX_PHP70=true  NGINX_BACKPORTS=false DOTDEB=true
+  fast_finish: true

 sudo: required

@@ -13,8 +28,21 @@ language: python
 services:
  - docker

+before_install:
+  - wget https://releases.hashicorp.com/vagrant/2.0.1/vagrant_2.0.1_x86_64.deb
+  - sudo dpkg -i vagrant_2.0.1_x86_64.deb
+
+install:
+  - pip install "$ANSIBLE_VERSION"
+
 script:
-  - docker build -f tests/$PLATFORM.Dockerfile -t test-$PLATFORM . && docker run -e "DOTDEB=$DOTDEB" -e "NGINX_PHP56=$NGINX_PHP56" -e "NGINX_PHP70=$NGINX_PHP70" -e "NGINX_BACKPORTS=$NGINX_BACKPORTS" --name $PLATFORM test-$PLATFORM
+  - VAGRANT_DEFAULT_PROVIDER=docker vagrant up $PLATFORM
+  - >
+    VAGRANT_DEFAULT_PROVIDER=docker vagrant provision $PLATFORM
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+  - VAGRANT_DEFAULT_PROVIDER=docker vagrant status

 notifications:
  webhooks: https://galaxy.ansible.com/api/v1/notifications/
--- a/README.md
+++ b/README.md
@@ -8,19 +8,29 @@ Install and configure Nginx on Debian/FreeBSD.
 Features:

 - SSL/TLS "hardened" support
- Manage basic auth on vhost / location
+- Manage basic auth on site / location
 - Proxy + Upstream
 - Fast PHP configuration
- Preconfigured vhost templates (should work on many app)
- Auto-configure HTTP2 on SSL/TLS vhosts
+- Preconfigured site templates (should work on many app)
+- Auto-configure HTTP2 on SSL/TLS sites
 - Manage dynamic modules (install and loading)
 - Deploy custom facts.d with sites config
 - Can listen with proxy protocol
+- Generate certificates with acme.sh (let's encrypt) -- *EXPERIMENTAL*
+
+Supported OS:
+
+| OS                 | Working | Stable (active support) |
+| ------------------ | ------- | ----------------------- |
+| Debian Jessie (8)  | Yes     | Yes                     |
+| Debian Stretch (9) | Yes     | Yes                     |
+| FreeBSD 11         | Yes     | No                      |
+| FreeBSD 12         | Yes     | No                      |

 Requirements
 ------------

-None. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
+Ansible 2.5+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.

 Role Variables
 --------------
@@ -53,12 +63,22 @@ FreeBSD:
 - `nginx_events_*`: all variables in events block
 - `nginx_http_*`: all variables in http block
 - `nginx_custom_http`: instructions list (will put data in `/etc/nginx/conf.d/custom.conf`)
- `nginx_dyn_modules`: dynamic module list to load
+- `nginx_module_packages`: package list module to install (Debian)
+- `nginx_load_modules`: module list to load (full path), should be used only on FreeBSD
+
+### Misc
+
+- `nginx_debug_role`: set _true_ if you need to see output of no\_log tasks 
+
+About modules
+-------------
+
+Last updates from Debian backports loads modules from /etc/nginx/modules-enabled directory. Disabling/Enabling is not supported anymore. Please wait further update.

 Fine configuration
 ------------------

-[Vhost configuration](doc/vhost.md)
+[Site configuration](doc/site.md)

 [PHP configuration](doc/php.md)

@@ -70,6 +90,7 @@ Fine configuration

 [FreeBSD](doc/freebsd.md)

+[acme.sh](doc/acme.md)

 Note
 ----
@@ -93,6 +114,19 @@ License

 GPLv2

+
+Donation
+--------
+
+If this code helped you, or if you’ve used them for your projects, feel free to buy me some :beers:
+
+- Bitcoin: `1BQwhBeszzWbUTyK4aUyq3SRg7rBSHcEQn`
+- Ethereum: `63abe6b2648fd892816d87a31e3d9d4365a737b5`
+- Litecoin: `LeNDw34zQLX84VvhCGADNvHMEgb5QyFXyD`
+- Monero: `45wbf7VdQAZS5EWUrPhen7Wo4hy7Pa7c7ZBdaWQSRowtd3CZ5vpVw5nTPphTuqVQrnYZC72FXDYyfP31uJmfSQ6qRXFy3bQ`
+
+No crypto-currency? :star: the project is also a way of saying thank you! :sunglasses:
+
 Author Information
 ------------------

--- a/69
+++ b/69
@@ -6,51 +6,78 @@
 Vagrant.configure("2") do |config|

  vms_debian = [
-    { :name => "debian-jessie",           :box => "debian/jessie64",           :vars => { "nginx_php56": true,  "nginx_php70": false, "dotdeb": false, "nginx_backports": false }},
-    { :name => "debian-jessie-backports", :box => "debian/jessie64",           :vars => { "nginx_php56": true,  "nginx_php70": false, "dotdeb": false, "nginx_backports": true  }},
-    { :name => "debian-jessie-dotdeb",    :box => "debian/jessie64",           :vars => { "nginx_php56": true,  "nginx_php70": true,  "dotdeb": true,  "nginx_backports": false }},
-    { :name => "debian-stretch",          :box => "sharlak/debian_stretch_64", :vars => { "nginx_php56": false, "nginx_php70": true,  "dotdeb": false, "nginx_backports": false }}
+    { :name => "debian-jessie", :box => "debian/jessie64", :vars => { "nginx_php": [{"version": "5.6"}] }},
+    { :name => "debian-jessie-backports", :box => "debian/jessie64", :vars => { "nginx_php": [{"version": "5.6"}], "nginx_backports": true }},
+    { :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-10.2", :box => "freebsd/FreeBSD-10.2-STABLE" }
+    { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE",  :vars => {} },
+    { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
  ]

-  config.vm.provider "virtualbox" do |v|
-    v.cpus = 1
-    v.memory = 256
+  conts = [
+    { :name => "docker-debian-jessie", :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "nginx_php" => [{"version" => "5.6"}] }},
+    { :name => "docker-debian-jessie-backports", :docker => "hanxhx/vagrant-ansible:debian8", :vars => { "nginx_php": [{"version": "5.6"}], "nginx_backports": true }},
+    { :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"
+  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
+
+  conts.each do |opts|
+    config.vm.define opts[:name] do |m|
+      m.vm.provider "docker" do |d|
+        d.image = opts[:docker]
+        d.remains_running = true
+        d.has_ssh = true
+      end
+      m.vm.provision "ansible" do |ansible|
+        ansible.playbook = "tests/test.yml"
+        ansible.verbose = 'vv'
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true })
+      end
+    end
  end

  vms_debian.each do |opts|
    config.vm.define opts[:name] do |m|
      m.vm.box = opts[:box]
-      m.vm.network "private_network", type: "dhcp"
+      m.vm.provider "virtualbox" do |v|
+        v.cpus = 1
+        v.memory = 256
+      end
      m.vm.provision "ansible" do |ansible|
        ansible.playbook = "tests/test.yml"
        ansible.verbose = 'vv'
-        ansible.sudo = true
-				ansible.extra_vars = opts[:vars]
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true })
      end
    end
  end
-  # See: https://forums.freebsd.org/threads/52717/
+
  vms_freebsd.each do |opts|
+    config.vm.base_mac = "080027D14C66"
    config.vm.define opts[:name] do |m|
      m.vm.box = opts[:box]
-      m.vm.network "private_network", type: "dhcp"
-      m.vm.guest = :freebsd
-      m.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
-      m.ssh.shell = "sh"
-      m.vm.base_mac = "080027D14C66"
+      m.vm.provider "virtualbox" do |v, override|
+        override.ssh.shell = "csh"
+        v.cpus = 2
+        v.memory = 512
+      end
      m.vm.provision "shell", inline: "pkg install -y python bash"
      m.vm.provision "ansible" do |ansible|
        ansible.playbook = "tests/test.yml"
        ansible.verbose = 'vv'
-        ansible.sudo = true
-        ansible.extra_vars = {
-          ansible_python_interpreter: '/usr/local/bin/python'
-        }
+        ansible.become = true
+        ansible.extra_vars = opts[:vars].merge({ "nginx_debug_role": true, "ansible_python_interpreter": '/usr/local/bin/python' })
      end
    end
  end
+
 end
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,8 +16,8 @@ nginx_resolver_valid: '300s'
 nginx_resolver_timeout: '5s'
 nginx_error_log_level: 'warn' # http://nginx.org/en/docs/ngx_core_module.html#error_log
 nginx_auto_config_httpv2: true
-nginx_default_vhost: null
-nginx_default_vhost_ssl: null
+nginx_default_site: null
+nginx_default_site_ssl: null
 nginx_fastcgi_fix_realpath: true

 #
@@ -32,13 +32,7 @@ nginx_helper_dir: '{{ nginx_etc_dir}}/helper'
 #

 # PHP
-nginx_php56: false
-nginx_php70: false
-nginx_php56_sockets:
-  - unix_socket: "/run/php5-fpm.sock"
-nginx_php70_sockets:
-  - unix_socket: "/run/php/php7.0-fpm.sock"
-nginx_upstreams: []
+nginx_php: []

 #
 # Nginx configuration
@@ -91,9 +85,14 @@ nginx_http_gzip_disable: '"msie6"'
 nginx_custom_http: []

 #
-# Vhosts
+# Sites
 #
-nginx_vhosts: []
+nginx_sites: []
+
+#
+# Upstreams
+#
+nginx_upstreams: []

 #
 # htpasswd
@@ -108,7 +107,8 @@ nginx_ssl_pairs: []
 #
 # Dynamic modules
 #
-nginx_dyn_modules: []
+nginx_module_packages: []
+nginx_load_modules: []

 #
 # Diffie-Hellman
@@ -117,9 +117,15 @@ nginx_dh: null
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
 nginx_dh_length: 2048

-# Extra
+#
+# acme.sh
+#
+nginx_acmesh: false
+nginx_acmesh_dir: "/opt/acme.sh"
+nginx_acmesh_git_dir: "/tmp/acme.sh"
+nginx_acmesh_test: false

-# Note:
-#   - On Debian, if you use Owncloud from Upstream repository, you must set this var to "/var/www/owncloud"
-#   - TODO: force this var in vars/FreeBSD.yml
-nginx_owncloud_root: '/usr/share/owncloud'
+#
+# Debug
+#
+nginx_debug_role: false
--- a/doc/acme.md
+++ b/doc/acme.md
@@ -0,0 +1,15 @@
+acme.sh
+=======
+
+Notes
+-----
+
+This feature is experimental.
+
+Variables
+---------
+
+- `nginx_acmesh`: (bool) Enable/Disable acme.sh feature
+- `nginx_acmesh_dir`: (string) Install directory
+- `nginx_acmesh_git_dir`: (string) Git directory (removed after install)
+- `nginx_acmesh_test`: (bool) If set to true (default false), uses test mode
--- a/doc/auth.md
+++ b/doc/auth.md
@@ -1,10 +1,15 @@
 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
 -----------

-Auth basic is managed in a separate list. Each auth file can be shared between locations or vhosts.
+Auth basic is managed in a separate list. Each auth file can be shared between locations or sites.

 Each htpasswd has few keys:

@@ -19,8 +24,8 @@ Example
 -------

 ```yaml
-nginx_vhosts:
-# htpasswd on all vhost
+nginx_sites:
+# htpasswd on all site
  - name: test.local
    htpasswd: 'hello'
    template: '_base'
--- a/doc/freebsd.md
+++ b/doc/freebsd.md
@@ -1,4 +1,17 @@
 Freebsd
 =======

+Limitations
+-----------
+
 Due to Ansible + FreeBSD limitations (`ansible_processor_vcpus`), You must explicitely set `nginx_worker_processes`.
+
+About modules
+-------------
+
+Dynamic modules must be set with full path (see `nginx_load_modules` path).
+
+Sites not tested
+----------------
+
+- BackupPC
--- a/doc/php.md
+++ b/doc/php.md
@@ -1,18 +1,23 @@
 PHP
 ===

- `nginx_php56` and `nginx_php70`: boolean if you need to preconfigure PHP (default: false)
- `nginx_php##_sockets`: list of sockets (see bellow)
+`nginx_php`:
+  - `version`: (M) PHP version
+  - `upstream_name` (O)
+  - `sockets`: (O) socket list
+
+If `sockets` is not provided, if uses local unix socket (based on PHP version).

 You should see [Nginx upstream module doc](http://nginx.org/en/docs/http/ngx_http_upstream_module.html).

 Each socket have:

- `unix_socket`
+- `unix`
+
+XOR
+
 - `host`
 - `port`
 - `weight`
 - `max_fails`
 - `fail_timeout`
-
-With default configuration, it works fine with PHP-FPM.
--- a/doc/vhost.md
+++ b/doc/vhost.md
@@ -1,17 +1,17 @@
-Vhost management
-================
+Site management
+===============

 You can see many examples in: [tests/test.yml](../tests/test.yml).

-`nginx_vhosts`: List of dict. A vhost has few keys. See bellow.
+`nginx_sites`: List of dict. A site has few keys. See bellow.

 Common
 ------

 - `name`: (M) Domain or list of domain used.
- `template`: (D) template used to create vhost. Optional if you set `delete` to true or using `redirect_tor`.
+- `template`: (D) template used to create site. Optional if you set `state`=`absent` or using `redirect_to`.
 - `filename`: (O) Specify filename in /etc/nginx/sites-*. Do NOT specify default (reserved keyword). It will be used for log filenames and directories creation.
- `state`: (O) Vhost status. Can be "present" (default), "absent" and "disabled".
+- `state`: (O) Site status. Can be "present" (default), "absent" and "disabled".
 - `redirect_from`: (O) Domain list to redirect to the first `name`. You can use this key to redirect non-www to www
 - `redirect_to`: (O) Redirect all requests to this domain. Please set scheme (http:// or https:// or $sheme).
 - `headers`: (O) Set additionals header as key/value list. You can append "always" to the value. Show [nginx doc](http://nginx.org/en/docs/http/ngx_http_headers_module.html).
@@ -23,7 +23,7 @@ Common
 - `upstream_params`: (O) Add upstream params (useful when you want to pass variables to PHP)
 - `override_try_files`: (O) overrides default try\_files defined in template
 - `manage_local_content`: (O) Boolean. Set to false if you do not want to manage local content (images, css...). This option is useless if you use `_proxy` template or `redirect_to` feature.
- `htpasswd`: (O) References name key in `nginx_htpasswd`. Enable auth basic on all vhost. Set "false" to disable.
+- `htpasswd`: (O) References name key in `nginx_htpasswd`. Enable auth basic on all site. Set "false" to disable.
 - `proto`: (O) list of protocol used. Default is a list with "http". If you need http and https, you must set a list with "http" and "https". You can only set "https" without http support.
 - `ssl_name`: (D) name of the key used when using TLS/SSL. 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".
@@ -42,8 +42,6 @@ Templates
 - `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap))
 - `_dokuwiki`
 - `_redirect`: should not be called explicitly
- `_nagios3`: access to Nagios3 (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap))
- `_owncloud`: access to Owncloud (note: you must set `nginx_apt_package` to //nginx-extras//) **UNSTABLE**
 - `_phalcon`: Phalcon PHP Framework
 - `_php`: PHP base template. Can work with many frameworks/tools
 - `_php_index`: Same as above. But you can only run index.php
@@ -57,17 +55,17 @@ About proxy template

 Proxy template allow you to use Nginx as reverse proxy. Usefull when you have an application service such as Redmine, Jenkins...

-You have many key added to vhost key:
+You have many key added to site key:

 - `upstream_name`: (O) upstream name used to pass proxy
- `proxy_params`: (M) list of raw params passed to the vhost
+- `proxy_params`: (M) list of raw params passed to the site

 (O) : Optional

-Default vhosts
+Default sites
 --------------

-You can manage default vhost by setting domain name to these variables.
+You can manage default site by setting domain name to these variables.

- `nginx_default_vhost`
- `nginx_default_vhost_ssl`
+- `nginx_default_site`
+- `nginx_default_site_ssl`
--- a/doc/ssl.md
+++ b/doc/ssl.md
@@ -15,25 +15,42 @@ Variables
 Cert/Key pairs
 --------------

-This list have 3 mandatory keys:
+Each pair must have a `name`.
+Note: `name` is used to deploy key/cert. With defaults values dans `name` = "foo", key is -> /etc/nginx/ssl/foo/foo.key

- `name`: MUST be unique
+### Content mode
+
+Key/Cert content is stored in variable. Usefull with vault.

 - `key`: content of the private key
 - `cert`: content of the public key

-OR
+### Remote file
+
+You can use these variables if you use another task/role to manages your certificates.

 - `dest_cert`: remote path where certificate is located
 - `dest_key`: remote path where key is located

-Note: `name` is used to deploy key/cert. With defaults values dans `name` = "foo", key is -> /etc/nginx/ssl/foo/foo.key
+### Self signed
+
+Create a self-signed pair and deploy it. Do not use this feature in production.
+
+- `self_signed`: set true to use this featrure
+- `force`: optional feature (default: false), force regen pair (not idempotent)
+
+### Acme
+
+Uses acme.sh to create free certificates. It uses HTTP-01 challenge. Use this feature for standalone servers.
+
+- `acme`: set true to use this feature. It uses `name` (can be a string or string list).
+
+Have a look to [acme configuratuion](acme.md configuration).

 Tips
 ----

- Deploying key/cert is not mandatory with this role. You can manage it in other place ([letsencrypt](https://letsencrypt.org/)? :)). You just need to set `dest_cert` and `dest_key`!
- In `nginx_vhosts`, `ssl_name` is mandatory. This role will search in `nginx_ssl_pairs` with vhost `name` (first in list if it's a list).
+- In `nginx_sites`, `ssl_name` is mandatory. This role will search in `nginx_ssl_pairs` with site `name` (first in list if it's a list).  

 Diffie-Hellman
 --------------
@@ -44,7 +61,7 @@ Example
 -------

 ```yaml
-nginx_vhosts;
+nginx_sites;
  - name: 'test-ssl.local'
    proto: ['http', 'https']
    template: '_base'
@@ -52,6 +69,13 @@ nginx_vhosts;
  - name: 'test-ssl2.local'
    proto: ['http', 'https']
    template: '_base'
+  - name: 'test-ssl3.local'
+    proto: ['http', 'https']
+    template: '_base'
+  - name: 'test-self-signed.local'
+    proto: ['http', 'https']
+    template: '_base'
+    ssl_name: 'this.is.self.signed'

 nginx_ssl_pairs:
  - name: mysuperkey
@@ -64,14 +88,9 @@ nginx_ssl_pairs:
      ....(snip)....
      -----END CERTIFICATE-----
  - name: test-ssl2.local
-    key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      ....(snip)....
-      -----END RSA PRIVATE KEY-----
-    cert: |
-      -----BEGIN CERTIFICATE-----
-      ....(snip)....
-      -----END CERTIFICATE-----
-
+    acme: true
+  - name: this.is.self.signed
+    self_signed: true
+    force: false
 ```

--- a/doc/upstream.md
+++ b/doc/upstream.md
@@ -8,7 +8,7 @@ Note: Few params are unavailable on old Nginx version. But this role do _not_ pu
 Upstream params
 ---------------

- `name`: upstream name. Can be use in vhost with *proxy_pass http://upstream_name*
+- `name`: upstream name. Can be use in site with *proxy_pass http://upstream_name*
 - `params`: list of param (hash, zone...)
 - `servers`: each upstream MUST have at least 1 server
 - `state`: Optional. Can be 'absent' or 'present'
--- a/filter_plugins/nginx.py
+++ b/filter_plugins/nginx.py
@@ -0,0 +1,20 @@
+def nginx_site_filename(site):
+    if site.has_key('filename'):
+        return site['filename']
+    else:
+        return nginx_site_name(site)
+
+def nginx_site_name(site):
+    if isinstance(site['name'], list):
+        return site['name'][0]
+    else:
+        return site['name']
+
+class FilterModule(object):
+    ''' Nginx module '''
+
+    def filters(self):
+        return {
+            'nginx_site_filename': nginx_site_filename,
+            'nginx_site_name': nginx_site_name
+        }
--- a/filter_plugins/php.py
+++ b/filter_plugins/php.py
@@ -0,0 +1,25 @@
+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
+        }
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,13 +1,42 @@
 ---

-# Reload wrapper
 - name: reload nginx
  command: nginx -t
-  notify: real-reload nginx
+  notify:
+    - real-reload nginx
+    - docker reload nginx
+
+- name: restart nginx
+  command: nginx -t
+  notify:
+    - real-restart nginx
+    - docker restart nginx

 - name: real-reload nginx
-  service: name=nginx state=reloaded
+  service:
+    name: nginx
+    state: reloaded
+  when: ansible_virtualization_type != 'docker'
+
+- name: real-restart nginx
+  service:
+    name: nginx
+    state: restarted
+  when: ansible_virtualization_type != 'docker'
+
+- name: docker reload nginx
+  command: service nginx reload
+  when: ansible_virtualization_type == 'docker'
+
+- name: docker restart nginx
+  command: service nginx restart
+  when: ansible_virtualization_type == 'docker'

 - name: restart nginx freebsd
-  service: name=nginx state=restarted
+  service:
+    name: nginx
+    state: restarted
  when: ansible_distribution == "FreeBSD"
+
+- name: setup
+  action: setup
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,17 +1,20 @@
 ---
 galaxy_info:
  author: Emilien Mantel
-  description: Nginx for Debian
+  description: Nginx for Debian / FreeBSD
  company:
  license: GPLv2
-  min_ansible_version: 2.0
+  min_ansible_version: 2.5
  platforms:
  - name: Debian
    versions:
    - jessie
+    - stretch
  - name: FreeBSD
    versions:
-    - 10.2
+    - 11.0
+    - 11.1
+    - 12.0
  galaxy_tags:
  - web
  - proxy
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -1,34 +1,45 @@
 ---

 - name: TEMPLATE | Deploy nginx.conf
-  template: >
-    src=etc/nginx/nginx.conf.j2
-    dest="{{ nginx_etc_dir }}/nginx.conf"
+  template:
+    src: "etc/nginx/nginx.conf.j2"
+    dest: "{{ nginx_etc_dir }}/nginx.conf"
  notify: reload nginx

 - name: TEMPLATE | Deploy all helpers
-  template: >
-    src={{ item }}
-    dest={{ nginx_helper_dir }}/{{ item | basename | regex_replace('\.j2$','') }}
+  template:
+    src: "{{ item }}"
+    dest: "{{ nginx_helper_dir }}/{{ item | basename | regex_replace('.j2$','') }}"
  with_fileglob: '../templates/etc/nginx/helper/*.j2'
  notify: reload nginx

 - name: TEMPLATE | Deploy custom http configuration
-  template: >
-    src=etc/nginx/conf.d/custom.conf.j2
-    dest="{{ nginx_etc_dir }}/conf.d/custom.conf"
+  template:
+    src: "etc/nginx/conf.d/custom.conf.j2"
+    dest: "{{ nginx_etc_dir }}/conf.d/custom.conf"
  notify: reload nginx

 - name: LINEINFILE | Fix path
-  lineinfile: >
-    regexp='{{ item.0.regexp }}'
-    line='{{ item.0.line }}'
-    dest='{{ item.1 }}'
-  with_nested:
-    -
+  lineinfile:
+    regexp: '{{ item.0.regexp }}'
+    line: '{{ item.0.line }}'
+    dest: '{{ item.1 }}'
+  loop: "{{ list_one | product(list_two) | list }}"
+  vars:
+    list_one:
      - regexp: '^fastcgi_param  SCRIPT_FILENAME'
        line: 'fastcgi_param  SCRIPT_FILENAME    $realpath_root$fastcgi_script_name;'
      - regexp: '^fastcgi_param  DOCUMENT_ROOT'
        line: 'fastcgi_param  DOCUMENT_ROOT      $realpath_root;'
-    - [ '/etc/nginx/fastcgi_params', '/etc/nginx/fastcgi.conf' ]
+    list_two:
+      - '{{ nginx_etc_dir }}/fastcgi.conf'
  when: nginx_fastcgi_fix_realpath
+
+- name: COPY | Add modules manually
+  copy:
+    content: |
+      {% for m in nginx_load_modules %}
+      load_module {{ m }};
+      {% endfor %}
+    dest: "{{ nginx_etc_dir }}/modules-enabled/000-modules.conf"
+  notify: reload nginx
--- a/tasks/dyn_modules.yml
+++ b/tasks/dyn_modules.yml
@@ -1,16 +0,0 @@
---
-
- name: FAIL | If Dynamic module is not available
-  fail: msg="{{ item }} dynamic module is not available"
-  with_items: "{{ nginx_dyn_modules }}"
-  when: "'{{ item }}=dynamic' not in nginx_modules"
-
- name: APT | Install nginx modules
-  apt: >
-    pkg="libnginx-mod-{{ item | replace('_', '-') }}"
-    state=present
-    default_release={{ ansible_distribution_release + '-backports' if nginx_backports else ansible_distribution_release }}
-  with_items: "{{ nginx_dyn_modules }}"
-  when:  ansible_distribution == 'Debian'
-
-# TODO: manage freebsd
--- a/tasks/htpasswd.yml
+++ b/tasks/htpasswd.yml
@@ -1,20 +1,21 @@
 ---

 - name: FILE | Delete htpasswd file
-  file: >
-    path={{ nginx_htpasswd_dir }}/{{ item.name }}
-    state=absent
+  file:
+    path: "{{ nginx_htpasswd_dir }}/{{ item.name }}"
+    state: absent
  with_items: "{{ nginx_htpasswd }}"
  when: item.state is defined and item.state == 'absent'
+  no_log: not nginx_debug_role

 - name: HTPASSWD | Manage files
-  htpasswd: >
-    name={{ item.1.name }}
-    password={{ item.1.password }}
-    state={{ item.1.state | default('present') }}
-    path={{ nginx_htpasswd_dir }}/{{ item.0.name }}
+  htpasswd:
+    name: "{{ item.1.name }}"
+    password: "{{ item.1.password }}"
+    state: "{{ item.1.state | default('present') }}"
+    path: "{{ nginx_htpasswd_dir }}/{{ item.0.name }}"
  with_subelements:
    - "{{ nginx_htpasswd }}"
    - users
  when: item.0.state is not defined or item.0.state == 'present'
-  no_log: true
+  no_log: not nginx_debug_role
--- a/tasks/install_Debian.yml
+++ b/tasks/install_Debian.yml
@@ -1,23 +1,58 @@
 ---

 - name: APT | Update cache
-  apt: >
-    update_cache=yes
-    cache_valid_time=3600
+  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' }}
+  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 }}
+  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 state=present
+  apt:
+    pkg: python-passlib
+    state: present
+
+- name: STAT | Check acme.sh is installed
+  stat:
+    path: "{{ nginx_acmesh_dir }}"
+  register: acme
+
+- block:
+
+  - name: APT | Install git
+    apt:
+      pkg: git
+
+  - name: GIT | Get acme.sh
+    git:
+      repo: 'https://github.com/Neilpang/acme.sh.git'
+      dest: '{{ nginx_acmesh_git_dir }}'
+      update: no
+
+  - name: SHELL | Install acme.sh
+    shell: ./acme.sh --install --home {{ nginx_acmesh_dir }} --cert-home {{ nginx_acmesh_dir }}
+    args:
+      chdir: "{{ nginx_acmesh_git_dir }}"
+      creates: "{{ nginx_acmesh_dir }}"
+
+  when: not acme.stat.exists
--- a/tasks/install_FreeBSD.yml
+++ b/tasks/install_FreeBSD.yml
@@ -1,46 +1,59 @@
 ---

 - name: PKGNG | Install nginx and related tools
-  pkgng: name={{ item }} state=present
+  pkgng:
+    name: "{{ item }}"
+    state: present
  with_items:
+    - acme.sh
    - "{{ nginx_pkgng_package }}"
    - py27-passlib
    - curl

+#
+# Bypass https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224166#c1
+#
+- block:
+
+    - name: COMMAND | Create /usr/local/etc/fdfs/http.conf
+      command: touch /usr/local/etc/fdfs/http.conf
+      args:
+        creates: /usr/local/etc/fdfs/http.conf
+      register: fd1
+
+    - name: LINEINFILE | Tune fdfs
+      lineinfile:
+        regexp: ^load_fdfs_parameters_from_tracker
+        line: load_fdfs_parameters_from_tracker=false
+        path: /usr/local/etc/fdfs/mod_fastdfs.conf
+      register: fd2
+
+    - name: SERVICE | Restart nginx when fdfs is tuned
+      service:
+        name: nginx
+        state: restarted
+      when: fd1.changed or fd2.changed
+
+  when: true
+
 - name: FILE | Create configuration dir (like Debian)
-  file: path="{{ nginx_etc_dir }}/{{ item }}" state=directory
+  file:
+    path: "{{ nginx_etc_dir }}/{{ item }}"
+    state: directory
  with_items:
    - conf.d
    - sites-available
    - sites-enabled

- name: STAT | Check fastcgi.conf
-  stat: path={{ nginx_etc_dir }}/fastcgi.conf
-  register: conf
-
- name: COPY | config
-  command: "cp {{ nginx_etc_dir }}/fastcgi_params {{ nginx_etc_dir }}/fastcgi.conf"
-  when: not conf.stat.exists
-  notify: reload nginx
-
- name: LINEINFILE | Add fastcgi config
-  lineinfile: >
-    line="fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;"
-    dest="{{ nginx_etc_dir }}/fastcgi.conf"
-  notify: reload nginx
-
- name: COPY | Populate proxy_params
-  copy: >
-    content="proxy_set_header Host $http_host;\nproxy_set_header X-Real-IP $remote_addr;\nproxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;proxy_set_header X-Forwarded-Proto $scheme;"
-    dest="{{ nginx_etc_dir }}/proxy_params"
-
 - name: FILE | Create log directory
-  file: >
-    path={{ nginx_log_dir }}
-    owner={{ nginx_user }}
-    group=wheel
-    mode=0755
-    state=directory
+  file:
+    path: "{{ nginx_log_dir }}"
+    owner: "{{ nginx_user }}"
+    group: wheel
+    mode: 0755
+    state: directory

 - name: SERVICE | Enable nginx
-  service: name=nginx enabled=yes
+  service:
+    name: nginx
+    enabled: yes
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,16 +2,15 @@

 - name: INCLUDE_VARS | Related to OS
  include_vars: "{{ ansible_distribution }}.yml"
+  tags: ['nginx::site', 'nginx::ssl']

 - name: INCLUDE | Install
-  include: install_{{ ansible_distribution }}.yml
+  include: "install_{{ ansible_distribution }}.yml"
+  tags: ['nginx::site', 'nginx::ssl']

 - name: INCLUDE | Prepare
  include: prepare.yml
-
- name: INCLUDE | Manage dynamic modules
-  include: dyn_modules.yml
-  when: nginx_version.stdout | version_compare('1.9.11', 'ge')
+  tags: ['nginx::site', 'nginx::ssl']

 - name: INCLUDE | Install
  include: config.yml
@@ -23,8 +22,9 @@
  include: htpasswd.yml

 - name: INCLUDE | SSL configuration
-  include: ssl.yml
-
- name: INCLUDE | Vhosts configuration
-  include: vhost.yml
+  include: ssl/main.yml
+  tags: ['nginx::ssl']

+- name: INCLUDE | Sites configuration
+  include: site.yml
+  tags: ['nginx::site']
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -6,6 +6,7 @@
    executable: /bin/sh
  register: nginx_version
  changed_when: false
+  check_mode: no

 - 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
@@ -13,14 +14,21 @@
    executable: /bin/sh
  register: shell_modules
  changed_when: false
+  check_mode: no

 - name: SET_FACT | Save modules
  set_fact:
    nginx_modules: "{{ shell_modules.stdout_lines }}"

 - name: FILE | Create folders
-  file: dest="{{ item.dir }}" owner="{{ item.owner }}" mode="{{ item.mode }}" state=directory
+  file:
+    dest: "{{ item.dir }}"
+    owner: "{{ item.owner }}"
+    mode: "{{ item.mode }}"
+    state: directory
  with_items: "{{ nginx_dirs }}"

 - name: FILE | Create ansible facts dir
-  file: path=/etc/ansible/facts.d state=directory
+  file:
+    path: /etc/ansible/facts.d
+    state: directory
--- a/tasks/site.yml
+++ b/tasks/site.yml
@@ -0,0 +1,106 @@
+---
+
+- name: FAIL | Check filenames
+  fail:
+    msg: "Forbidden keyword default on site {{ item | nginx_site_name }}"
+  when: item.filename is defined and item.filename == 'default'
+  with_items: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FAIL | Check HTTPS redir and proto
+  fail:
+    msg: "You can't have HTTP proto and HTTPS redirection at the same time"
+  when:
+    ((item.proto is defined and 'http' in item.proto) or (item.proto is not defined)) and
+    (item.redirect_http is defined and item.redirect_http)
+  with_items: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Create root directory
+  file:
+    path: "{{ nginx_root }}"
+    state: directory
+
+- name: FILE | Create root public folders (foreach nginx_sites)
+  file:
+    path: "{{ nginx_root }}/{{ item | nginx_site_filename }}/public"
+    state: directory
+    owner: "{{ item.owner | default(nginx_user) }}"
+    group: "{{ item.group | default(nginx_user) }}"
+    mode: "{{ item.mode | default('0755') }}"
+  loop: "{{ nginx_sites }}"
+  when: >
+    item.root is not defined and
+    (item.template is defined and item.template not in nginx_templates_no_dir) and
+    (item.state is not defined or not item.state != 'absent') and
+    item.redirect_to is not defined
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: TEMPLATE | Create sites
+  template:
+    src: "etc/nginx/sites-available/{{ item.template if item.redirect_to is not defined else '_redirect' }}.j2"
+    dest: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: item.state is not defined or item.state != 'absent'
+  loop: "{{ nginx_sites }}"
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Delete sites
+  file:
+    path: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
+    state: absent
+  with_nested:
+    - "{{ nginx_sites }}"
+    - ['sites-available', 'sites-enabled']
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: item.0.state is defined and item.0.state == 'absent'
+  loop_control:
+    label: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
+
+- name: FILE | Enable sites
+  file:
+    src: "{{ nginx_etc_dir }}/sites-available/{{ item | nginx_site_filename }}"
+    dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_filename }}"
+    state: link
+  with_items: "{{ nginx_sites }}"
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: >
+    item.state is not defined or item.state == 'present'
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Disable sites
+  file:
+    path: "{{ nginx_etc_dir}}/sites-enabled/{{ item | nginx_site_filename }}"
+    state: absent
+  with_items: "{{ nginx_sites }}"
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: item.state is defined and item.state == 'disabled'
+  loop_control:
+    label: "{{ item | nginx_site_name }}"
+
+- name: FILE | Delete default site when explicitely defined
+  file:
+    path: "{{ nginx_etc_dir }}/sites-enabled/default"
+    state: absent
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: nginx_default_site is not none
+
+- name: FILE | Auto set default site
+  file:
+    src: "{{ nginx_etc_dir }}/sites-available/default"
+    dest: "{{ nginx_etc_dir }}/sites-enabled/default"
+    state: link
+  notify: ['reload nginx', 'restart nginx freebsd']
+  when: nginx_default_site is none
+
+- name: TEMPLATE | Deploy facts
+  template:
+    src: etc/ansible/facts.d/nginx.fact.j2
+    dest: /etc/ansible/facts.d/nginx.fact
+    mode: 0644
+  notify: ['setup']
--- a/tasks/ssl.yml
+++ b/tasks/ssl.yml
@@ -1,52 +0,0 @@
---
-
- name: COMMAND | Generate DH file
-  command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
-  args:
-    creates: "{{ nginx_dh_path }}"
-  when: nginx_dh is not string
-  notify: reload nginx
-  async: 1000
-  register: dh
-
- name: COPY | Deploy DH file from vars
-  copy: >
-    content="{{ nginx_dh }}"
-    dest="{{ nginx_dh_path }}"
-  when: nginx_dh is string
-  notify: reload nginx
-
- name: FILE | Create SSL directories
-  file: >
-    path="{{ nginx_ssl_dir + '/' + item.name }}"
-    state=directory
-  with_items: "{{ nginx_ssl_pairs }}"
-  when: item.dest_key is not defined or item.dest_cert is not defined
-  no_log: true
-
- name: COPY | Deploy SSL keys
-  copy: >
-    content="{{ item.key }}"
-    dest="{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.key' if item.dest_key is not defined else item.dest_key }}"
-    mode=0640
-  with_items: "{{ nginx_ssl_pairs }}"
-  when: item.key is defined
-  notify: reload nginx
-  no_log: true
-
- name: COPY | Deploy SSL certs
-  copy: >
-    content="{{ item.cert }}"
-    dest="{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
-    mode=0644
-  with_items: "{{ nginx_ssl_pairs }}"
-  when: item.cert is defined
-  notify: reload nginx
-  no_log: true
-
- name: Check DH command status
-  async_status: jid={{ dh.ansible_job_id }}
-  register: job_result
-  until: job_result.finished
-  retries: 30
-  when: nginx_dh is not string
--- a/tasks/ssl/acme.yml
+++ b/tasks/ssl/acme.yml
@@ -0,0 +1,72 @@
+---
+
+- 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"
+  with_items: "{{ 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 }}"
+  when: item.skipped is not defined and not item.stat.exists
+
+- 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 }}"
+  register: fake_site
+
+- name: FILE | Delete current site if needed
+  file:
+    path: "{{ nginx_etc_dir }}/sites-enabled/{{ item | nginx_site_name }}"
+    state: absent
+  with_items: "{{ acme_create }}"
+  when: fake_site.changed
+
+- name: SERVICE | Restart nginx
+  service:
+    name: nginx
+    state: restarted
+  when: fake_site.changed and ansible_virtualization_type != 'docker'
+
+- name: COMMAND | Restart nginx
+  command: service nginx restart
+  args:
+    warn: false
+  when: fake_site.changed and ansible_virtualization_type == 'docker'
+
+- name: SHELL | 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 %}'
+  args:
+    creates: "/root/.acme.sh/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
+  with_items: "{{ acme_create }}"
+  register: acme_get
+  failed_when: acme_get.rc != 0 and acme_get.rc != 2
+  no_log: not nginx_debug_role
+
+- name: FILE | Create SSL dir per site
+  file:
+    path: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}"
+  with_items: "{{ acme_create }}"
+
+- name: SHELL | 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"'
+  args:
+    creates: "{{ nginx_ssl_dir }}/{{ item | nginx_site_name }}/{{ item | nginx_site_name }}.key"
+  with_items: "{{ nginx_ssl_pairs }}"
+  when: item.acme is defined and item.acme
+  notify: restart nginx
+
+- name: FILE | Delete fake sites
+  file:
+    path: "{{ nginx_etc_dir }}/conf.d/FAKESITE_{{ item | nginx_site_name }}.conf"
+    state: absent
+  with_items: "{{ acme_create }}"
--- a/tasks/ssl/main.yml
+++ b/tasks/ssl/main.yml
@@ -0,0 +1,8 @@
+---
+
+- name: INCLUDE | standard.yml
+  include: standard.yml
+
+- name: INCLUDE | acme.yml
+  include: acme.yml
+  when: nginx_acmesh
--- a/tasks/ssl/standard.yml
+++ b/tasks/ssl/standard.yml
@@ -0,0 +1,63 @@
+---
+
+- name: COMMAND | Generate DH file
+  command: openssl dhparam -out {{ nginx_dh_path }} {{ nginx_dh_length }}
+  args:
+    creates: "{{ nginx_dh_path }}"
+  when: nginx_dh is not string
+  notify: restart nginx
+  async: 1000
+  register: dh
+
+- name: COPY | Deploy DH file from vars
+  copy:
+    content: "{{ nginx_dh }}"
+    dest: "{{ nginx_dh_path }}"
+  when: nginx_dh is string
+  notify: restart nginx
+
+- name: FILE | Create SSL directories
+  file:
+    path: "{{ nginx_ssl_dir + '/' + item | nginx_site_name }}"
+    state: directory
+  with_items: "{{ 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 }}"
+    mode: 0640
+  with_items: "{{ nginx_ssl_pairs }}"
+  when: item.key is defined
+  notify: restart nginx
+  no_log: not nginx_debug_role
+
+- name: COPY | Deploy SSL certs
+  copy:
+    content: "{{ item.cert }}"
+    dest: "{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
+    mode: 0644
+  with_items: "{{ 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' }}"
+  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 %}"
+  with_items: "{{ 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
--- a/tasks/upstream.yml
+++ b/tasks/upstream.yml
@@ -1,29 +1,30 @@
 ---

- name: SET_FACT | Backward compatibility with old version of this role
-  set_fact: >
-    nginx_php56: true
-  when: nginx_php is defined and nginx_php
-
 - name: TEMPLATE | Deploy PHP upstream to Nginx
-  template: >
-    src=etc/nginx/upstream/php.conf.j2
-    dest="{{ nginx_etc_dir }}/conf.d/php.conf"
-  when: nginx_php56 or nginx_php70
+  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/upstream/upstream.conf.j2
-    dest={{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf
-  with_items: "{{ nginx_upstreams }}"
+  template:
+    src: "etc/nginx/conf.d/_upstream.conf.j2"
+    dest: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
+  loop: "{{ nginx_upstreams }}"
  when: item.state is not defined or item.state == 'present'
  notify: reload nginx

 - name: FILE | Delete other upstreams
-  file: >
-    path={{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf
-    state=absent
+  file:
+    path: "{{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf"
+    state: absent
  with_items: "{{ nginx_upstreams }}"
  when: item.state is defined and item.state == 'absent'
  notify: reload nginx
--- a/tasks/vhost.yml
+++ b/tasks/vhost.yml
@@ -1,90 +0,0 @@
---
-
- name: FAIL | Check filenames
-  fail: msg="Forbidden keyword default on vhost {{ item.name if item.name is string else item.name[0] }}"
-  when: item.filename is defined and item.filename == 'default'
-  with_items: "{{ nginx_vhosts }}"
-
- name: FAIL | Check HTTPS redir and proto
-  fail: msg="You can't have HTTP proto and HTTPS redirection at the same time"
-  when: >
-    ((item.proto is defined and 'http' in item.proto) or (item.proto is not defined)) and
-    (item.redirect_http is defined and item.redirect_http)
-  with_items: "{{ nginx_vhosts }}"
-
- name: FILE | Create root directory
-  file: >
-    path={{ nginx_root }}
-    state=directory
-
- name: FILE | Create root public folders (foreach nginx_vhosts)
-  file: >
-    path={{ nginx_root }}/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}/public
-    state=directory
-    owner={{ item.owner | default(nginx_user) }}
-    group={{ item.group | default(nginx_user) }}
-    mode={{ item.mode | default('0755') }}
-  with_items: "{{ nginx_vhosts }}"
-  when: >
-    item.root is not defined and
-    (item.template is defined and item.template not in nginx_templates_no_dir) and
-    (item.state is not defined or not item.state != 'absent') and
-    item.redirect_to is not defined
-
- name: TEMPLATE | Create vhosts
-  template: >
-    src=etc/nginx/sites-available/{{ item.template if item.redirect_to is not defined else '_redirect' }}.j2
-    dest={{ nginx_etc_dir }}/sites-available/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
-  with_items: "{{ nginx_vhosts }}"
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: item.state is not defined or item.state != 'absent'
-
- name: FILE | Delete vhosts
-  file: path={{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0.filename | default(item.0.name if item.0.name is string else item.0.name[0]) }} state=absent
-  with_nested:
-    - "{{ nginx_vhosts }}"
-    - ['sites-available', 'sites-enabled']
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: item.state is defined and item.state == 'absent'
-
- name: FILE | Enable vhosts
-  file: >
-    src={{ nginx_etc_dir }}/sites-available/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
-    dest={{ nginx_etc_dir }}/sites-enabled/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
-    state=link
-  with_items: "{{ nginx_vhosts }}"
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: >
-    item.state is not defined or item.state == 'present'
-
- name: FILE | Disable vhosts
-  file: path={{ nginx_etc_dir}}/sites-enabled/{{ item.filename | default(item.name if item.name is string else item.name[0]) }} state=absent
-  with_items: "{{ nginx_vhosts }}"
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: item.state is defined and item.state == 'disabled'
-
- name: FILE | Delete default vhost when explicitely defined
-  file: >
-    path={{ nginx_etc_dir }}/sites-enabled/default
-    state=absent
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: nginx_default_vhost is not none
-
- name: FILE | Auto set default vhost
-  file: >
-    src={{ nginx_etc_dir }}/sites-available/default
-    dest={{ nginx_etc_dir }}/sites-enabled/default
-    state=link
-  notify: ['reload nginx', 'restart nginx freebsd']
-  when: nginx_default_vhost is none
-
- name: TEMPLATE | Deploy facts
-  template:
-    src=etc/ansible/facts.d/nginx.fact.j2
-    dest=/etc/ansible/facts.d/nginx.fact
-    mode=0644
-  register: fact
-
- name: SETUP
-  action: setup
-  when: fact.changed
--- a/templates/etc/ansible/facts.d/nginx.fact.j2
+++ b/templates/etc/ansible/facts.d/nginx.fact.j2
@@ -1,4 +1,4 @@
 {
-       "fact_nginx_vhosts":
-       {{ nginx_vhosts | to_nice_json(indent=8) }}
+       "fact_nginx_sites":
+       {{ nginx_sites | to_nice_json(indent=8) }}
 }
--- a/templates/etc/nginx/conf.d/FAKESITE.conf.j2
+++ b/templates/etc/nginx/conf.d/FAKESITE.conf.j2
@@ -0,0 +1,10 @@
+server {
+	listen {{ item.acme_port | default('80') }};
+	listen [::]:{{ item.acme_port | default('80') }};
+
+	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(" ") }}{% endif %}{% if item.redirect_from is defined %} {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ item.redirect_from | join(" ") }}{% endif %}{% endif %};
+
+	location / {
+		return 503;
+	}
+}
--- a/templates/etc/nginx/upstream/upstream.conf.j2
+++ b/templates/etc/nginx/upstream/upstream.conf.j2
@@ -1,5 +1,5 @@
 {%- macro s(key, value, is_bool, min_version) %}
-{% if nginx_version.stdout | version_compare(min_version, 'ge') %}
+{% if nginx_version.stdout is version(min_version, 'ge') %}
 {% if is_bool and value %} {{ key }}{% elif not is_bool %} {{ key }}={{ value }}{% endif %}
 {% endif %}
 {%- endmacro -%}
--- a/templates/etc/nginx/conf.d/php.conf.j2
+++ b/templates/etc/nginx/conf.d/php.conf.j2
@@ -0,0 +1,20 @@
+#
+# {{ ansible_managed }}
+#
+
+{% for php in nginx_php %}
+upstream {{ php.upstream_name | default((php.version | php_default_upstream_name)) }} {
+{% for sock in php.sockets | default([]) %}
+{% if sock.host is defined %}
+    server {{ sock.host }}:{{ sock.port }} weight={{ sock.weight | default('1') }} max_fails={{ sock.max_fails | default('5') }} fail_timeout={{ sock.fail_timeout | default('10s') }};
+{% else %}
+    server unix:{{ sock.unix | default((php.version | php_default_upstream_socket)) }} weight={{ sock.weight | default('1') }};
+{% endif %}
+{% else %}
+    server unix:{{ php.version | php_default_upstream_socket }} weight=1;
+{% endfor %}
+}
+
+{% endfor %}
+
+# vim:filetype=nginx
--- a/templates/etc/nginx/helper/ssl-legacy.j2
+++ b/templates/etc/nginx/helper/ssl-legacy.j2
@@ -3,14 +3,12 @@
 #

 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;
+ssl_protocols TLSv1 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 | version_compare('1.7.5', 'ge') %} always{% endif %};
-{% if nginx_version.stdout | version_compare('1.3.7', 'ge') %}
+add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
 ssl_stapling on;
 ssl_stapling_verify on;
-{% endif %}
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
 resolver_timeout {{ nginx_resolver_timeout }};
 ssl_dhparam {{ nginx_dh_path }};
--- a/templates/etc/nginx/helper/ssl-strong.j2
+++ b/templates/etc/nginx/helper/ssl-strong.j2
@@ -3,14 +3,12 @@
 #

 ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ssl_protocols TLSv1 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 | version_compare('1.7.5', 'ge') %} always{% endif %};
-{% if nginx_version.stdout | version_compare('1.3.7', 'ge') %}
+add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
 ssl_stapling on;
 ssl_stapling_verify on;
-{% endif %}
 resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
 resolver_timeout {{ nginx_resolver_timeout }};
 ssl_dhparam {{ nginx_dh_path }};
--- a/templates/etc/nginx/nginx.conf.j2
+++ b/templates/etc/nginx/nginx.conf.j2
@@ -5,10 +5,8 @@
 user {{ nginx_user }};
 worker_processes {{ nginx_worker_processes }};
 pid {{ nginx_pid }};
-{% if nginx_version.stdout | version_compare('1.9.11', 'ge') %}
-{% for module in nginx_dyn_modules -%}
-load_module "modules/ngx_{{ module }}_module.so";
-{% endfor %}
+{% if nginx_version.stdout is version('1.9.11', 'ge') %}
+include {{ nginx_etc_dir }}/modules-enabled/*.conf;
 {% endif %}

 events {
--- a/templates/etc/nginx/sites-available/_backuppc.j2
+++ b/templates/etc/nginx/sites-available/_backuppc.j2
@@ -25,7 +25,7 @@
 {% block template_upstream_location %}
 	location ~ \.cgi$ {
 		gzip off;
-		include {{ nginx_etc_dir }}/fastcgi_params;
+		include fastcgi.conf;
 		fastcgi_pass unix:/var/run/fcgiwrap.socket;
 		fastcgi_index BackupPC_Admin;
 		fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name;
--- a/templates/etc/nginx/sites-available/_base.j2
+++ b/templates/etc/nginx/sites-available/_base.j2
@@ -1,7 +1,7 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item.filename | default(item.name if item.name is string else item.name[0]) %}
-{% set __listen = item.listen | default([80]) %}
-{% set __listen_ssl = item.listen_ssl | default([443]) %}
+{% set __main_name =  item | nginx_site_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 __location = item.location | default({}) %}
@@ -17,11 +17,23 @@
 {%- endif %}
 {%- endmacro %}
 {% macro ssl(ssl_name) %}
-{% for sn in nginx_ssl_pairs if sn.name == ssl_name %}
+{% for sn in nginx_ssl_pairs if ((sn.name is string and sn.name == ssl_name) or (sn.name.0 == ssl_name)) %}
 	ssl_certificate {{ 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 }};
 {% endfor %}
 {%- endmacro %}
+{% macro httpsredirect(name) %}
+server {
+{% for port in __listen %}
+	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+{% endfor %}
+	server_name {{ name }};
+	location / {
+		return 301 https://{{ name }}{% if '443' not in __listen_ssl and 443 not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
+	}
+}
+{% endmacro %}
+
 #
 # {{ ansible_managed }}
 #
@@ -32,12 +44,12 @@
 server {
 {% if 'http' in __proto %}
 {% for port in __listen %}
-	listen {{ port }}{% if nginx_default_vhost == __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 %}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
 {% endfor %}
 {% endif %}
 {% if 'https' in __proto %}
 {% for port in __listen_ssl %}
-	listen {{ port }}{% if nginx_default_vhost_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} 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 nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
 {% endfor %}
 {{ ssl(__ssl_name) }}
 {% if item.ssl_template is not defined or item.ssl_template != false %}
@@ -71,7 +83,7 @@ server {
 {% block template_headers %}
 	# --> Custom headers
 {% for key, value in __headers.iteritems() %}
-	add_header {{ key }} "{{ value | replace(' always', '') }}"{% if nginx_version.stdout | version_compare('1.7.5', 'ge') and ' always' in value %} always{% endif %};
+	add_header {{ key }} "{{ value | replace(' always', '') }}"{% if nginx_version.stdout is version('1.7.5', 'ge') and ' always' in value %} always{% endif %};
 {% endfor %}
 	# <-- Custom headers
 {% endblock %}
@@ -142,15 +154,14 @@ server {
 #
 # Redirect HTTP to HTTPS
 #
-server {
-{% for port in __listen %}
-	listen {{ port }}{% if nginx_default_vhost == __main_name %} default_server{% endif %}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
+{% if item.name is string %}
+{{ httpsredirect(item.name) }}
+{% else %}
+{% for i in item.name %}
+{{ httpsredirect(i) }}
 {% endfor %}
-	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ "\n\t\t" }}{{ item.name | join("\n\t\t") }}{% endif %};
-	return 301 https://{{ __main_name }}{% if '443' not in __listen_ssl %}:{{ __listen_ssl[0] }}{% endif %}$request_uri;
-}
 {% endif %}
-
+{% endif %}

 {% if item.redirect_from is defined and item.redirect_from is iterable %}
 #
@@ -161,8 +172,27 @@ server {
 	listen {{ port }}{% if port | int in __http_proxy_protocol_port %} proxy_protocol{% endif %};
 {% endfor %}
 	server_name {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ "\n\t\t" }}{{ item.redirect_from | join("\n\t\t") }}{% endif %};
-	return 301 $scheme://{{ __main_name }}$request_uri;
+	location / {
+		return 301 $scheme://{{ item.name if item.name is string else item.name[0] }}$request_uri;
+	}
+}
+
+{% if 'https' in __proto %}
+server {
+{% for port in __listen_ssl %}
+	listen {{ port }}{% if nginx_default_site_ssl == __main_name %} default_server{% endif %} ssl{% if nginx_auto_config_httpv2 and 'http_v2' in nginx_modules %} http2{% endif %}{% if port | int in __https_proxy_protocol_port %} proxy_protocol{% endif %};
+{% endfor %}
+{{ 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') }};
+{% endif %}
+	server_name {% if item.redirect_from is string %}{{ item.redirect_from }}{% else %}{{ "\n\t\t" }}{{ item.redirect_from | join("\n\t\t") }}{% endif %};
+	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;
+	}
 }
 {% endif %}

+{% endif %}
+
 # vim:filetype=nginx
--- a/templates/etc/nginx/sites-available/_nagios3.j2
+++ b/templates/etc/nginx/sites-available/_nagios3.j2
@@ -1,67 +0,0 @@
-{% extends "_php.j2" %}
-
-{% block root %}
-	root {{ nginx_nagios_root }};
-{% endblock %}
-
-{% block template_try_files %}
-{% endblock %}
-
-{% block template_index %}
-	index index.php index.html;
-{% endblock %}
-
-{% block template_headers %}
-	# --> Custom headers
-{% for key, value in __headers.iteritems() %}
-{% if key == "X-Frame-Options" %}
-	# X-Frame-Options forced by Ansible
-	add_header {{ key }} "SAMEORIGIN"{% if nginx_version.stdout | version_compare('1.7.5', 'ge') %} always{% endif %};
-{% else %}
-	add_header {{ key }} "{{ value | replace(' always', '') }}"{% if nginx_version.stdout | version_compare('1.7.5', 'ge') and ' always' in value %} always{% endif %};
-{% endif %}
-{% endfor %}
-	# <-- Custom headers
-{% endblock %}
-
-
-{% block template_local_content %}
-	location ~ /\.ht {
-		deny all;
-	}
-
-	location /stylesheets {
-{% if nginx_nagios_stylesheets is defined %}
-		alias {{ nginx_nagios_stylesheets }};
-{% endif %}
-		expires 60d;
-	}
-{% endblock %}
-
-{% block template_upstream_location %}
-{% if ansible_distribution == 'Debian' %}
-	location /cgi-bin/nagios3 {
-		root /usr/lib;
-{% elif ansible_distribution == 'FreeBSD' %}
-	location /cgi-bin {
-{% endif %}
-		try_files $uri =404;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-		fastcgi_pass unix:{{ nginx_fcgiwrap_sock }};
-		fastcgi_param AUTH_USER $remote_user;
-		fastcgi_param REMOTE_USER $remote_user;
-	}
-	location ~ \.php$ {
-		fastcgi_pass {{ php_upstream }};
-		fastcgi_index index.php;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-	}
-{% endblock %}
--- a/templates/etc/nginx/sites-available/_owncloud.j2
+++ b/templates/etc/nginx/sites-available/_owncloud.j2
@@ -1,87 +0,0 @@
-{% extends "_php.j2" %}
-
-{% block root %}
-	root {{ nginx_owncloud_root }};
-{% endblock %}
-
-{% block template_index %}
-	index index.php;
-{% endblock %}
-
-{% block template_more %}
-	error_page 403 /core/templates/403.php;
-	error_page 404 /core/templates/404.php;
-	gzip off;
-	client_max_body_size 10G;
-	fastcgi_buffers 64 4K;
-	rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
-	rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
-	rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
-{% endblock %}
-
-{% block template_headers %}
-	add_header X-XSS-Protection "1; mode=block";
-	add_header X-Robots-Tag none;
-	add_header X-Content-Type-Options nosniff;
-	add_header X-Download-Options noopen;
-	add_header X-Permitted-Cross-Domain-Policies none;
-	add_header X-Frame-Options SAMEORIGIN;
-{% endblock %}
-
-{% block template_try_files %}
-		try_files $uri $uri/ =404;
-{% endblock %}
-
-{% block template_upstream_location %}
-	location ~ /remote.php {
-		dav_methods PUT DELETE MKCOL COPY MOVE;
-		dav_ext_methods PROPFIND OPTIONS;
-		fastcgi_pass {{ php_upstream }};
-		fastcgi_param HOME {{ nginx_owncloud_root }};
-		fastcgi_param HTTP_HOME {{ nginx_owncloud_root }};
-		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
-		fastcgi_param modHeadersAvailable true;
-		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-	}
-
-	location ~ \.php(?:$|/) {
-		fastcgi_pass {{ php_upstream }};
-		fastcgi_index index.php;
-		fastcgi_param HOME {{ nginx_owncloud_root }};
-		fastcgi_param HTTP_HOME {{ nginx_owncloud_root }};
-		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
-		fastcgi_param modHeadersAvailable true;
-		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
-		include fastcgi.conf;
-{% endif %}
-	}
-{% endblock %}
-
-{% block template_local_content %}
-	location ~* \.(?:css|js)$ {
-		try_files $uri /index.php$is_args$args;
-		expires 2h;
-	}
-
-	location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|swf)$ {
-		expires 2d;
-	}
-
-	location = /robots.txt {
-		allow all;
-		log_not_found off;
-		access_log off;
-	}
-
-	location ~ ^/(?:\.ht|data|config|db_structure\.xml|README){
-		deny all;
-	}
-{% endblock %}
--- a/templates/etc/nginx/sites-available/_php.j2
+++ b/templates/etc/nginx/sites-available/_php.j2
@@ -1,22 +1,14 @@
 {% extends "_base.j2" %}

-{% macro phpv(version) %}
-{% if version == 56 or version == "56" or version == "5.6" %}
-{{ nginx_upstream_php56 -}}
-{% elif version == 70 or version == "70" or version == "7.0" %}
-{{ nginx_upstream_php70 -}}
-{% else %}
-{# Hack... define another upstream #}
-{{ version -}}
-{% endif %}
-{%- endmacro -%}
-
 {% if item.php_version is defined %}
-{% set php_upstream = phpv(item.php_version) %}
-{% elif nginx_php56 %}
-{% set php_upstream = phpv(56) %}
-{% elif nginx_php70 %}
-{% set php_upstream = phpv(70) %}
+{% 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 %}
@@ -24,11 +16,12 @@
 {% endblock %}

 {% block template_try_files %}
-		try_files {{ override_try_files | default('$uri $uri/ /index.php') }};
+		try_files {{ override_try_files | default('$uri $uri/ =404') }};
 {% endblock %}

 {% block template_upstream_location %}
 	location ~ \.php$ {
+		# {{ php_info }}
 		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
@@ -36,10 +29,6 @@
 		{{ param }}
 {% endfor %}
 {% endif %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}
--- a/templates/etc/nginx/sites-available/_php_index.j2
+++ b/templates/etc/nginx/sites-available/_php_index.j2
@@ -2,6 +2,7 @@

 {% block template_upstream_location %}
 	location = /index.php {
+		# {{ php_info }}
 		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
@@ -9,11 +10,7 @@
 		{{ param }}
 {% endfor %}
 {% endif %}
-{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
-		include fastcgi_params;
-{% else %}
 		include fastcgi.conf;
-{% endif %}
 	}
 {% endblock %}

--- a/templates/etc/nginx/sites-available/_php_index2.j2
+++ b/templates/etc/nginx/sites-available/_php_index2.j2
@@ -0,0 +1,19 @@
+{% extends "_php.j2" %}
+
+{% block template_try_files %}
+		try_files {{ override_try_files | default('$uri $uri/ /index.php') }};
+{% endblock %}
+
+{% block template_upstream_location %}
+	location = /index.php {
+		# {{ php_info }}
+		fastcgi_pass {{ php_upstream }};
+		fastcgi_index index.php;
+{% if item.upstream_params is defined and item.upstream_params is iterable %}
+{% for param in item.upstream_params %}
+		{{ param }}
+{% endfor %}
+{% endif %}
+		include fastcgi.conf;
+	}
+{% endblock %}
--- a/templates/etc/nginx/upstream/php.conf.j2
+++ b/templates/etc/nginx/upstream/php.conf.j2
@@ -1,30 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-
-{% if nginx_php56 %}
-upstream {{ nginx_upstream_php56 }} {
-{% for item in nginx_php56_sockets %}
-{% if item.unix_socket is defined %}
-	server unix:{{ item.unix_socket }} weight={{ item.weight | default('1') }};
-{% else %}
-	server {{ item.host }}:{{ item.port }} weight={{ item.weight | default('1') }} max_fails={{ item.max_fails | default('5') }} fail_timeout={{ item.fail_timeout | default('10s') }};
-{% endif %}
-{% endfor %}
-}
-
-{% endif %}
-{% if nginx_php70 %}
-upstream {{ nginx_upstream_php70 }} {
-{% for item in nginx_php70_sockets %}
-{% if item.unix_socket is defined %}
-	server unix:{{ item.unix_socket }} weight={{ item.weight | default('1') }};
-{% else %}
-	server {{ item.host }}:{{ item.port }} weight={{ item.weight | default('1') }} max_fails={{ item.max_fails | default('5') }} fail_timeout={{ item.fail_timeout | default('10s') }};
-{% endif %}
-{% endfor %}
-}
-
-{% endif %}
-
-# vim:filetype=nginx
--- a/tests/debian-jessie.Dockerfile
+++ b/tests/debian-jessie.Dockerfile
@@ -1,4 +0,0 @@
-FROM williamyeh/ansible:debian8-onbuild
-
-RUN apt-get update
-CMD ["sh", "tests/travis.sh"]
--- a/tests/includes/post_Debian.yml
+++ b/tests/includes/post_Debian.yml
@@ -1,11 +1,15 @@
 ---

- name: APT | Install web apps
-  apt: pkg={{ item }} state=present install_recommends=no
-  with_items:
+- name: APT | Install webapps
+  apt:
+    pkg: "{{ packages }}"
+    state: present
+    install_recommends: no
+  vars:
+    packages:
      - backuppc
-    - nagios3
-#    - owncloud

 - name: SERVICE | Ensure backuppc is started
-  service: name=backuppc state=started
+  service:
+    name: backuppc
+    state: started
--- a/tests/includes/post_FreeBSD.yml
+++ b/tests/includes/post_FreeBSD.yml
@@ -1,29 +1,23 @@
 ---

- name: APT | Install web apps
-  pkgng: pkg={{ item }} state=present
-  with_items:
-    - nagios
-    - backuppc
-
- name: COMMAND | Activate backuppc config
-  command: >
-    cp /usr/local/etc/backuppc/config.pl.sample /usr/local/etc/backuppc/config.pl
-    creates=/usr/local/etc/backuppc/config.pl
-
- name: FILE | Fix backuppc permissions
-  file: >
-    path=/usr/local/etc/backuppc/config.pl
-    owner=backuppc
-    group=backuppc
-
- name: FILE | Fix fcgiwrap permission
-  file: >
-    path={{ nginx_fcgiwrap_sock }}
-    mode=0640
-    owner={{ nginx_user }}
-    group={{ nginx_user }}
-
+#- name: APT | Install web apps
+#  pkgng:
+#    pkg: "{{ item }}"
+#    state: present
+#  with_items:
+#    - backuppc
+#
+#- name: COMMAND | Activate backuppc config
+#  command: >
+#    cp /usr/local/etc/backuppc/config.pl.sample /usr/local/etc/backuppc/config.pl
+#    creates=/usr/local/etc/backuppc/config.pl
+#
+#- name: FILE | Fix backuppc permissions
+#  file:
+#    path: /usr/local/etc/backuppc/config.pl
+#    owner: backuppc
+#    group: backuppc
+#
 #
 # We don't manage BackupPC on FreeBSD... too dirty. :/
 #
--- a/tests/includes/pre_Debian.yml
+++ b/tests/includes/pre_Debian.yml
@@ -1,47 +1,102 @@
 ---

 - name: APT_REPOSITORY | Install backports
-  apt_repository: repo='deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main' state=present
+  apt_repository:
+    repo: 'deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main'
+    state: present
+  when: nginx_backports

 - block:
+
  - name: APT | Install DotDeb key
-    apt_key: url='http://www.dotdeb.org/dotdeb.gpg' state=present
+    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
+    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
+    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={{ item }} update_cache=yes cache_valid_time=3600 state=present
-  with_items:
+  apt:
+    pkg: "{{ packages }}"
+    update_cache: yes
+    cache_valid_time: 3600
+    state: present
+  vars:
+    packages:
+      - cron
      - curl
      - fcgiwrap
+      - jq
      - nghttp2
      - strace
      - vim
+      - unzip

- name: APT | Install PHP5.6
-  apt: pkg={{ item }} update_cache=yes cache_valid_time=3600 state=present
-  with_items:
-    - php5-fpm
-    - php5-sqlite
-  when: nginx_php56
+- 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 PHP7
-  apt: pkg={{ item }} update_cache=yes cache_valid_time=3600 state=present
-  with_items:
-    - php7.0-fpm
-    - php7.0-sqlite3
-  when: nginx_php70
+- name: APT | Install PHP
+  apt:
+    pkg: "{{ item.version | php_fpm_package }}"
+    update_cache: yes
+    cache_valid_time: 3600
+    state: present
+  loop: "{{ nginx_php }}"
+  register: apt_php

- name: SERVICE | Force start services
-  service: name={{ item.name }} state=started
-  register: sf
-  with_items:
-    - { name: 'php5-fpm', cond: "{{ nginx_php56 }}" }
-    - { name: 'php7.0-fpm', cond: "{{ nginx_php70 }}" }
-    - { name: 'fcgiwrap', cond: true }
-  when: "{{ item.cond }}"
+- name: SERVICE | Force start fcgiwrap
+  service:
+    name: "fcgiwrap"
+    state: started
+
+# Bypasses Ansible+Docker issue. With service module... php is not really started!
+- name: COMMAND | Force start PHP
+  command: "service {{ item.version | php_fpm_service }} start"
+  args:
+    creates: "{{ item.version | php_default_upstream_socket }}"
+    warn: false
+  loop: "{{ nginx_php }}"
+
+- name: GET_URL | Download ngrok
+  get_url:
+    url: "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip"
+    dest: "/tmp/ngrok.zip"
+
+- name: UNARCHIVE | Uncompress ngrok
+  unarchive:
+    src: "/tmp/ngrok.zip"
+    dest: "/tmp"
+    remote_src: yes
+
+- name: SET_FACT | ngrok_path
+  set_fact:
+    ngrok_path: '/tmp/ngrok'
--- a/tests/includes/pre_FreeBSD.yml
+++ b/tests/includes/pre_FreeBSD.yml
@@ -2,24 +2,65 @@

 - name: SET_FACT | FreeBSD web user
  set_fact:
-    nginx_pkgng_package: 'nginx-devel'
+    nginx_pkgng_package: 'nginx-full'
    nginx_user: 'www'
-    nginx_php70: false
-    nginx_php56_sockets:
+    nginx_php:
+      - version: '7.2'
+        sockets:
          - host: '127.0.0.1'
            port: 9000
+    nginx_load_modules:
+      - /usr/local/libexec/nginx/ngx_http_geoip_module.so
+    ngrok_path: '/usr/local/bin/ngrok'

 - name: PKGNG | Install needed packages
-  pkgng: pkg={{ item }} state=present
-  with_items:
-    - php56
+  pkgng:
+    pkg: "{{ packages }}"
+    state: present
+  vars:
+    packages:
      - curl
+      - daemonize
      - fcgiwrap
+      - GeoIP
+      - jq
      - nghttp2
+      - php72
+      - vim
+
+- name: COMMAND | Get geoip database
+  command: geoipupdate.sh
+  args:
+    creates: /usr/local/share/GeoIP/GeoIP.dat

 - name: SERVICE | Force start services
-  service: name={{ item }} state=started enabled=yes
+  service:
+    name: "{{ item }}"
+    state: started
+    enabled: yes
  register: sf
-  with_items:
+  loop:
    - php-fpm
    - fcgiwrap
+
+- name: STAT | Check ports
+  stat:
+    path: /usr/ports
+  register: ports
+
+- block:
+
+    - name: COMMAND | Get ports
+      command: portsnap fetch --interactive
+
+    - name: COMMAND | Extract ports
+      command: portsnap extract
+      no_log: true
+
+  when: not ports.stat.exists
+
+- name: SHELL | Install ngrok
+  shell: make install clean DISABLE_LICENSES=yes
+  args:
+    chdir: /usr/ports/security/ngrok
+    creates: "{{ ngrok_path }}"
--- a/tests/includes/pre_common.yml
+++ b/tests/includes/pre_common.yml
@@ -0,0 +1,29 @@
+---
+
+- name: SHELL | Start ngrok
+  shell: daemonize -l /tmp/ngrok.lock {{ ngrok_path }} http 8888 -bind-tls=false
+  failed_when: false
+  changed_when: ngrok.stderr.find("Can't lock the lock file") == -1
+  register: ngrok
+
+- name: WAIT_FOR | ngrok started
+  wait_for:
+    delay: 2
+    port: 4040
+  when: ngrok.changed
+
+- name: SHELL | Get ngrok public address
+  shell: curl 'http://127.0.0.1:4040/api/tunnels/command_line' | jq '.public_url' | grep -oE '[[:alnum:]]+\.ngrok\.io'
+  args:
+    warn: false
+  register: ngrok
+  changed_when: false
+
+- name: LINEINFILE | Tune vimrc
+  lineinfile:
+    line: "set mouse="
+    dest: "{{ item }}/.vimrc"
+    create: yes
+  loop:
+    - /root
+    - /home/vagrant
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,25 +2,41 @@

 - hosts: all
  pre_tasks:
-    - debug: var=dotdeb
-    - debug: var=nginx_php56
-    - debug: var=nginx_php70
-    - debug: var=nginx_backports
    - name: INCLUDE | Pre_tasks related to OS version
      include: "includes/pre_{{ ansible_distribution }}.yml"
+
+    - name: INCLUDE | Pre_tasks common
+      include: "includes/pre_common.yml"
+
    - name: FILE | Create an internal SSL dir
-      file: path={{ int_ansible_ssl_dir }} state=directory
+      file:
+        path: "{{ int_ansible_ssl_dir }}"
+        state: directory
+
    - name: COPY | Deploy test certificate
-      copy: src=file/test.crt dest={{ int_ansible_ssl_dir }}/test.crt
+      copy:
+        src: "file/test.crt"
+        dest: "{{ int_ansible_ssl_dir }}/test.crt"
+
    - name: COPY | Deploy test key
-      copy: src=file/test.key dest={{ int_ansible_ssl_dir }}/test.key
+      copy:
+        src: "file/test.key"
+        dest: "{{ int_ansible_ssl_dir }}/test.key"
+
+    - name: 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'
+        dest: "/etc/hosts"
+        unsafe_writes: yes
+
  vars:
 # Internal vars
    int_ansible_ssl_dir: '/etc/ansible-ssl'
 # Role vars
    nginx_worker_processes: 1 # Ansible+FreeBSD can't detect CPU number
    nginx_apt_package: 'nginx-extras'
-    nginx_dyn_modules: ['http_geoip']
+    nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
    nginx_upstreams:
      - name: 'test'
        servers:
@@ -44,16 +60,20 @@
            state: 'absent'
          - name: 'hanx'
            password: 'qwerty'
-      - name: 'nagios'
-        description: 'Please login to Nagios!'
-        users:
-          - name: 'nagiosadmin'
-            password: 'nagios'
      - name: 'deleteme'
        description: 'Please login!'
        users: []
        state: 'absent'
+    nginx_acmesh: true
+    nginx_acmesh_test: true
    nginx_ssl_pairs:
+      - name:
+          - '{{ ngrok.stdout }}'
+        acme: true
+        acme_port: 8888
+      - name: 'test-ssl-selfsigned.local'
+        self_signed: true
+        force: false
      - name: 'test-ssl-predeployed.local'
        dest_key: "{{ int_ansible_ssl_dir }}/test.key"
        dest_cert: "{{ int_ansible_ssl_dir }}/test.crt"
@@ -108,16 +128,16 @@
          -----END CERTIFICATE-----
    nginx_custom_http:
      - 'add_header X-ansible 1;'
-      - 'geoip_country /usr/share/GeoIP/GeoIP.dat;'
+      - 'geoip_country {% if ansible_distribution == "Debian" %}/usr/share/GeoIP/GeoIP.dat{% else %}/usr/local/share/GeoIP/GeoIP.dat{% endif %};'
      - 'map $geoip_country_code $allowed_country {'
      - '    default yes;'
      - '    MA no;'
      - '    DZ no;'
      - '    TN no;'
      - '}'
-    nginx_default_vhost: 'first-test'
-    nginx_default_vhost_ssl: 'test-ssl-predeployed.local'
-    nginx_vhosts:
+    nginx_default_site: 'first-test'
+    nginx_default_site_ssl: 'test-ssl-predeployed.local'
+    nginx_sites:
      - name:
          - 'test.local'
          - 'test-alias.local'
@@ -170,7 +190,7 @@
          - '/b'
          - '/c'
      - name: 'test-php.local'
-        php_version: "{{ '7.0' if nginx_php70 else '5.6' }}"
+        php_version: "{{ nginx_php.1.version if nginx_php.1 is defined else nginx_php.0.version }}"
        upstream_params:
          - 'fastcgi_param FOO bar;'
        redirect_from:
@@ -180,6 +200,8 @@
        use_access_log: true
      - name: 'test-php-index.local'
        template: '_php_index'
+      - name: 'test-php-index2.local'
+        template: '_php_index2'
      - name: 'test-proxy.local'
        listen:
          - 8080
@@ -194,12 +216,12 @@
      - name: 'backuppc.local'
        template: '_backuppc'
        htpasswd: 'hello'
-      - name: 'nagios3.local'
-        template: '_nagios3'
-        htpasswd: 'nagios'
      - name: 'test-ssl.local'
        proto: ['http', 'https']
        template: '_base'
+      - name: 'test-ssl-selfsigned.local'
+        proto: ['http', 'https']
+        template: '_base'
      - name: 'test-ssl-predeployed.local'
        proto: ['http', 'https']
        template: '_base'
@@ -212,6 +234,17 @@
        template: '_base'
        ssl_name: 'test-ssl.local'
        redirect_https: true
+      - name:
+          - 'test-ssl-redirect-many.local'
+          - 'test-ssl-redirect-many2.local'
+        listen_ssl: [8443]
+        proto: ['https']
+        template: '_base'
+        ssl_name: 'test-ssl.local'
+        redirect_https: true
+        redirect_from:
+          - 'www.test-ssl-redirect-many.local'
+          - 'www.test-ssl-redirect-many2.local'
      - name: 'test-ssl-proxy-protocol.local'
        proto: ['http', 'https']
        listen: [80, 20080]
@@ -220,7 +253,13 @@
        https_proxy_protocol_port: [20443]
        template: '_base'
        ssl_name: 'test-ssl.local'
-    nginx_dh_length: 2048
+      - name: '{{ ngrok.stdout }}'
+        proto: ['http', 'https']
+        template: '_base'
+        ssl_name: '{{ ngrok.stdout }}'
+        headers:
+          'X-acme': '1'
+    nginx_dh_length: 1024
  roles:
    - ../../
  post_tasks:
@@ -229,194 +268,235 @@
 # --------------------------------
    - name: INCLUDE | Post_tasks related to OS version
      include: "includes/post_{{ ansible_distribution }}.yml"
+
 # --------------------------------
 # Deploy index files
 # --------------------------------
    - name: -- Add PHP file --
-      copy: dest="{{ nginx_root }}/{{ item }}/public/index.php" content="<?php phpinfo();"
-      with_items: ['test-php.local', 'test-php-index.local']
+      copy:
+        dest: "{{ nginx_root }}/{{ item }}/public/index.php"
+        content: "<?php phpinfo();"
+      loop:
+        - 'test-php.local'
+        - 'test-php-index.local'
+        - 'test-php-index2.local'
+
    - name: -- Add HTML file --
-      copy: dest="{{ item }}/index.html" content="Index HTML test OK\n"
-      with_items: ['{{ nginx_root }}/first-test/public', '/var/tmp', '{{ nginx_root }}/test-htpasswd-all.local/public', '{{ nginx_root }}/test-ssl.local/public', '{{ nginx_root }}/test-ssl-predeployed.local/public', '{{ nginx_root }}/test-ssl-proxy-protocol.local/public']
+      copy:
+        dest: "{{ item }}/index.html"
+        content: "Index HTML test OK\n"
+      loop:
+        - '{{ nginx_root }}/first-test/public'
+        - '/var/tmp'
+        - '{{ nginx_root }}/test-htpasswd-all.local/public'
+        - '{{ nginx_root }}/test-ssl.local/public'
+        - '{{ nginx_root }}/test-ssl-selfsigned.local/public'
+        - '{{ nginx_root }}/test-ssl-predeployed.local/public'
+        - '{{ nginx_root }}/test-ssl-proxy-protocol.local/public'
+        - '{{ nginx_root }}/{{ ngrok.stdout }}/public'
+
    - name: -- Create directory --
-      file: path={{ nginx_root }}/test-htpasswd.local/public/hello state=directory
+      file:
+        path: "{{ nginx_root }}/test-htpasswd.local/public/hello"
+        state: directory
+
    - name: -- Add HTML file hello --
-      copy: dest="{{ nginx_root }}/test-htpasswd.local/public/hello/index.html" content="hello\n"
+      copy:
+        dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html"
+        content: "hello\n"
+
 # --------------------------------
 # Test custom facts
 # --------------------------------
    - name: -- CHECK FACTS --
      assert:
-        that: "'{{ ansible_local.nginx.fact_nginx_vhosts[0].name[0] }}' == 'test.local'"
+        that: "'{{ ansible_local.nginx.fact_nginx_sites[0].name[0] }}' == 'test.local'"
 # --------------------------------
-# Simple vhosts tests
+# Simple sites tests
 # --------------------------------
-    - name: -- VERIFY VHOSTS --
-      command: "curl -H 'Host: {{ item.name if item.name is string else item.name[0] }}' http://127.0.0.1{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
-      with_items: "{{ nginx_vhosts }}"
+    - name: -- VERIFY SITES --
+      uri:
+        url: "http://{{ item | nginx_site_name }}{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
+        status_code: '200,301,302,401,403'
+        follow_redirects: none
+      loop: "{{ nginx_sites }}"
      when: item.state is undefined or item.state != "absent"
      changed_when: false
+
    - name: -- VERIFY FORBIDDEN --
-      command: "curl -H 'Host: test-php-index.local' http://127.0.0.1/phpinfo.php"
-      register: f
-      failed_when: f.stdout.find('403 Forbidden') == -1
+      uri:
+        url: "http://test-php-index.local/phpinfo.php"
+        status_code: 403
+
+    - name: -- VERIFY REDIRECT SITES --
+      uri:
+        url: "http://{{ item.redirect_from[0] }}/"
+        status_code: 301
+        follow_redirects: none
+      loop: "{{ nginx_sites }}"
+      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and (item.proto is not defined or 'https' not in item.proto)
      changed_when: false
-    - name: -- VERIFY REDIRECT VHOSTS --
-      command: "curl -H 'Host: {{ item.redirect_from[0] }}' http://127.0.0.1/"
-      with_items: "{{ nginx_vhosts }}"
-      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent")
+
+    - name: -- VERIFY REDIRECT HTTPS SITES --
+      uri:
+        url: "https://{{ item.redirect_from[0] }}:{{ item.listen_ssl[0] | default(443) }}/"
+        status_code: 301
+        follow_redirects: none
+        validate_certs: no
+      loop: "{{ nginx_sites }}"
+      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and item.proto is defined and 'https' in item.proto
      changed_when: false
-      register: r
-      failed_when: r.stdout.find('301 Moved Permanently') == -1

 # --------------------------------
 # PHP
 # --------------------------------
-    - name: -- VERIFY PHP5 VHOSTS (implicit default) --
-      command: "curl -H 'Host: {{ item }}' http://127.0.0.1/"
+    - name: -- VERIFY PHP SITES --
+      uri:
+        url: "http://{{ item.name}}/"
+        return_content: yes
      register: p
-      changed_when: false
-      failed_when: p.stdout.find('PHP Version 5') == -1
-      with_items: ['test-php-index.local']
-      when: nginx_php56
+      loop: "{{ nginx_sites }}"
+      when: >
+        item.template is defined and
+        (item.template == '_php' or item.template == '_php_index' or item.template == '_php_index2')
+      failed_when: p.content.find('PHP Version ' + item.php_version if 'php_version' in item else nginx_php.0.version) == -1

-    - name: -- VERIFY PHP7 VHOSTS --
-      command: "curl -H 'Host: {{ item }}' http://127.0.0.1/"
-      register: p
-      changed_when: false
-      failed_when: p.stdout.find('PHP Version 7') == -1
-      with_items: ['test-php.local']
-      when: nginx_php70
+    - name: -- VERIFY INDEX2 --
+      uri:
+        url: "http://test-php-index2.local/lorem.php?ipsum=sit&dolor=amet"
+        return_content: yes
+      register: p2
+      failed_when: p2.content.find('PHP Version') == -1

 # --------------------------------
 # Basic Auth
 # --------------------------------
    - name: -- VERIFY AUTH BASIC NONE --
-      command: "curl -H 'Host: test-htpasswd.local' http://127.0.0.1/hello/"
-      changed_when: false
-      register: authnone
-      failed_when: authnone.stdout.find('401 Authorization Required') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+
    - name: -- VERIFY AUTH BASIC FAIL --
-      command: "curl -u fail:fail -H 'Host: test-htpasswd.local' http://127.0.0.1/hello/"
-      changed_when: false
-      register: authfail
-      failed_when: authfail.stdout.find('401 Authorization Required') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        status_code: 401
+        user: "fail"
+        password: "fail"
+        force_basic_auth: yes
+
    - name: -- VERIFY AUTH BASIC OK --
-      command: "curl -u hanx:qwerty -H 'Host: test-htpasswd.local' http://127.0.0.1/hello/"
-      changed_when: false
-      register: authok
-      failed_when: authok.stdout.find('hello') == -1
+      uri:
+        url: "http://test-htpasswd.local/hello/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+
    - name: -- VERIFY AUTH BASIC FAIL GLOBAL --
-      command: "curl -u fail:fail -H 'Host: test-htpasswd-all.local' http://127.0.0.1/"
-      changed_when: false
-      register: authgfail
-      failed_when: authgfail.stdout.find('401 Authorization Required') == -1
-    - name: -- VERIFY AUTH BASIC OK --
-      command: "curl -u hanx:qwerty -H 'Host: test-htpasswd-all.local' http://127.0.0.1/"
-      changed_when: false
-      register: authgok
-      failed_when: authgok.stdout.find('401 Authorization Required') != -1
+      uri:
+        url: "http://test-htpasswd-all.local/"
+        status_code: 401
+        user: "fail"
+        password: "fail"
+        force_basic_auth: yes
+
+    - name: -- VERIFY AUTH BASIC OK GLOBAL --
+      uri:
+        url: "http://test-htpasswd-all.local/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes

 # --------------------------------
 # BackupPC
 # --------------------------------
    - name: -- VERIFY BACKUPPC --
-      command: "curl -u hanx:qwerty -H 'Host: backuppc.local' http://127.0.0.1/"
-      changed_when: false
+      uri:
+        url: "http://backuppc.local/"
+        user: "hanx"
+        password: "qwerty"
+        force_basic_auth: yes
+        return_content: yes
      register: authbpc
-      failed_when: authbpc.stdout.find('BackupPC Server Status') == -1
      when: ansible_distribution != 'FreeBSD'
-
-# --------------------------------
-# Nagios
-# --------------------------------
-    - name: -- VERIFY NAGIOS3 PHP --
-      command: "curl -u nagiosadmin:nagios -H 'Host: nagios3.local' http://127.0.0.1/side.php"
-      changed_when: false
-      register: nagios_php
-      failed_when: nagios_php.stdout.find('Nagios Core') == -1
-    - name: -- VERIFY NAGIOS3 CGI --
-      command: "curl -u nagiosadmin:nagios -H 'Host: nagios3.local' http://127.0.0.1/cgi-bin{% if ansible_distribution == 'Debian' %}/nagios3{% endif %}/summary.cgi"
-      changed_when: false
-      register: nagios_cgi
-      failed_when: nagios_cgi.stdout.find('Nagios Event Summary') == -1
-
-# --------------------------------
-# Owncloud
-# --------------------------------
-#    - block:
-#      - name: -- VERIFY OWNCLOUD --
-#        command: "curl -H 'Host: owncloud.local' http://127.0.0.1/"
-#        changed_when: false
-#        register: ownsimple
-#        failed_when: ownsimple.stdout.find('ownCloud') == -1
-#      - name: -- VERIFY OWNCLOUD JS (FROM PHP)--
-#        command: "curl -H 'Host: owncloud.local' http://127.0.0.1/index.php/core/js/oc.js"
-#        changed_when: false
-#        register: ownjsphp
-#        failed_when: ownjsphp.stdout.find('var oc_debug=false') == -1
-#      - name: -- VERIFY OWNCLOUD JS --
-#        command: "curl -H 'Host: owncloud.local' http://127.0.0.1/core/js/js.js"
-#        changed_when: false
-#        register: ownjs
-#        failed_when: ownjs.stdout.find('var oc_debug') == -1
-#      when: ansible_distribution != 'FreeBSD'
+      failed_when: authbpc.content.find('BackupPC Server Status') == -1

 # --------------------------------
 # SSL
 # --------------------------------
    - name: -- VERIFY SSL --
-      command: "curl --insecure -H 'Host: {{ item }}' https://127.0.0.1/"
-      changed_when: false
+      uri:
+        url: "https://{{ item }}/"
+        return_content: yes
+        validate_certs: no
      register: sslok
-      failed_when: sslok.stdout.find('Index HTML test OK') == -1
-      with_items:
+      failed_when: sslok.content.find('Index HTML test OK') == -1
+      loop:
        - 'test-ssl-predeployed.local'
+        - 'test-ssl-selfsigned.local'
        - 'test-ssl.local'
+        - '{{ ngrok.stdout }}'
+
    - name: -- VERIFY SSL REDIRECT --
-      command: "curl -v --insecure -H 'Host: {{ item }}' http://127.0.0.1/"
-      changed_when: false
+      uri:
+        url: "http://{{ item.name }}/"
+        validate_certs: no
+        status_code: 301
+        return_content: yes
+        follow_redirects: none
      register: sslredirok
-      failed_when: >
-        sslredirok.stderr.find('< Location') == -1 and
-        sslredirok.stderr.find('https://{{ item }}/') == -1
-      with_items:
-        - 'test-ssl-redirect.local'
+      failed_when: '"https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.location'
+      loop:
+        - name: 'test-ssl-redirect.local'
+        - name: 'test-ssl-redirect-many.local'
+          port: '8443'
+        - name: 'test-ssl-redirect-many2.local'
+          port: '8443'

 # --------------------------------
-# Default vhosts
+# Default sites
 # --------------------------------
-    - name: -- VERIFY DEFAULT VHOST --
-      command: "curl -v http://127.0.0.1/"
-      changed_when: false
+    - name: -- VERIFY DEFAULT SITE --
+      uri:
+        url: 'http://127.0.0.1/'
+        return_content: yes
      register: vdefault
      failed_when: >
-        vdefault.stdout.find('Index HTML test OK') == -1 or
-        vdefault.stderr.find('X-ansible-default') == -1
-    - name: -- VERIFY DEFAULT SSL VHOST --
-      command: "curl --insecure -v https://127.0.0.1/"
-      changed_when: false
-      register: defaultssl
-      failed_when: >
-        defaultssl.stdout.find('Index HTML test OK') == -1 or
-        defaultssl.stderr.find('X-ansible-default') == -1
-    - name: -- VERIFY NOT DEFAULT VHOST --
-      command: "curl -v -H 'Host: test-php.local' http://127.0.0.1/"
-      changed_when: false
-      register: vphp
-      failed_when: vphp.stderr.find('X-ansible-default') != -1
-    - name: -- VERIFY NOT DEFAULT SSL VHOST --
-      command: "curl --insecure -v -H 'Host: test-ssl.local' https://127.0.0.1/"
-      changed_when: false
-      register: notdefaultssl
-      failed_when: notdefaultssl.stderr.find('X-ansible-default') != -1
-    - name: -- VERIFY DEFAULT VHOST + STUB_STATUS --
-      command: "curl -v http://127.0.0.1/status"
-      changed_when: false
+        vdefault.content.find('Index HTML test OK') == -1 or
+        vdefault.x_ansible_default is not defined
+
+    - name: -- VERIFY DEFAULT SITE + STUB STATUS--
+      uri:
+        url: 'http://127.0.0.1/status'
+        return_content: yes
      register: vdefault_status
      failed_when: >
-        vdefault_status.stderr.find('X-ansible-default') == -1 or
-        vdefault_status.stdout.find('Active connections') == -1
+        vdefault_status.content.find('Active connections') == -1 or
+        vdefault_status.x_ansible_default is not defined
+
+    - name: -- VERIFY DEFAULT SSL SITE --
+      uri:
+        url: 'https://127.0.0.1/'
+        return_content: yes
+        validate_certs: no
+      register: vdefault
+      failed_when: >
+        vdefault.content.find('Index HTML test OK') == -1 or
+        vdefault.x_ansible_default is not defined
+
+    - name: -- VERIFY NOT DEFAULT SITE --
+      uri:
+        url: 'http://test-php.local/'
+        return_content: yes
+      register: vphp
+      failed_when: vphp.x_ansible_default is defined
+
+    - name: -- VERIFY NOT DEFAULT SSL SITE --
+      uri:
+        url: 'https://test-ssl.local/'
+        return_content: yes
+        validate_certs: no
+      register: notdefaultssl
+      failed_when: notdefaultssl.x_ansible_default is defined

 # --------------------------------
 # Check HTTP2
--- a/tests/travis.sh
+++ b/tests/travis.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Thanks to https://servercheck.in/blog/testing-ansible-roles-travis-ci-github
-
-DIR=$( dirname $0 )
-PLAYBOOK="$DIR/test.yml"
-
-
-set -ev
-
-ANSIBLE_VARS="{ nginx_php56: $NGINX_PHP56, nginx_php70: $NGINX_PHP70, nginx_backports: $NGINX_BACKPORTS, dotdeb: $DOTDEB }"
-
-echo $ANSIBLE_VARS
-
-# Check syntax
-ansible-playbook -i localhost, -c local --syntax-check -vv $PLAYBOOK
-
-# Check role
-ansible-playbook -i localhost, -c local -e "$ANSIBLE_VARS" --sudo -vv $PLAYBOOK
-
-# Check indempotence
-ansible-playbook -i localhost, -c local -e "$ANSIBLE_VARS" --sudo -vv $PLAYBOOK \
-| grep -q 'changed=0.*failed=0' \
-&& (echo 'Idempotence test: pass' && exit 0) \
-|| (echo 'Idempotence test: fail' && exit 1)
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -2,7 +2,5 @@ nginx_events_use: 'epoll'
 nginx_pid: '/run/nginx.pid'
 nginx_etc_dir: '/etc/nginx'

-# Specific vhosts
-nginx_nagios_root: '/usr/share/nagios3/htdocs'
-nginx_nagios_stylesheets: '/etc/nagios3/stylesheets'
+# Specific sites
 nginx_fcgiwrap_sock: '/var/run/fcgiwrap.socket'
--- a/vars/FreeBSD.yml
+++ b/vars/FreeBSD.yml
@@ -2,6 +2,7 @@ nginx_events_use: 'kqueue'
 nginx_pid: '/var/run/nginx.pid'
 nginx_etc_dir: '/usr/local/etc/nginx'

-# Specific vhosts
-nginx_nagios_root: '/usr/local/www/nagios'
+# Specific sites
 nginx_fcgiwrap_sock: '/var/run/fcgiwrap/fcgiwrap.sock'
+
+nginx_acmesh_bin: '/usr/local/sbin/acme.sh'
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -32,11 +32,15 @@ nginx_dirs:
  - dir: "{{ nginx_helper_dir }}"
    mode: "0755"
    owner: "root"
+  - dir: "{{ nginx_etc_dir }}/modules-available"
+    mode: "0755"
+    owner: "root"
+  - dir: "{{ nginx_etc_dir }}/modules-enabled"
+    mode: "0755"
+    owner: "root"

 nginx_templates_no_dir:
  - '_backuppc'
-  - '_nagios3'
-  - '_owncloud'
  - '_proxy'

 nginx_servers_default_headers:
@@ -44,5 +48,4 @@ nginx_servers_default_headers:
  'X-Content-Type-Options': 'nosniff always'
  'X-XSS-Protection': '1; mode=block'

-nginx_upstream_php56: 'php56'
-nginx_upstream_php70: 'php70'
+nginx_acmesh_bin: "{{ nginx_acmesh_dir }}/acme.sh"
Author	SHA1	Message	Date
Emilien M	8218e5c972	Fix deprecations (#35 ) * Drop Nagios support * Fix start PHP-FPM on Docker * Fix deprecations on Ansible 2.7 - with_ -> loop - fix filters as test - test version_compare -> version - set min_version to 2.5	2019-01-24 11:05:46 +01:00
Emilien Mantel	87c1c68949	Add Ansible 2.5 + 2.6 to travis	2018-10-03 14:09:20 +02:00
Emilien Mantel	817929beca	Add self-signed cert feature	2018-04-20 09:32:46 +02:00
Emilien Mantel	678dff9a1a	Tune vimrc (mouse is boring on stretch)	2018-04-20 09:20:39 +02:00
Emilien Mantel	3da65983bd	Fix acme create	2018-03-22 20:35:51 +01:00
Emilien Mantel	3fb8f092fb	Fake site + force IPv6	2018-03-22 20:30:10 +01:00
Emilien Mantel	19a85ca381	Autoconfigure ipv6 on fakesite	2018-03-22 19:48:41 +01:00
Emilien Mantel	2bab49221a	Autoconfigure IPv6 on each server	2018-03-22 19:47:30 +01:00
Emilien Mantel	6e877c070e	Configure nginx restart with acme.sh	2018-03-22 19:03:33 +01:00
Emilien Mantel	c165f88126	Manage multiple names with acme.sh	2018-03-22 18:43:44 +01:00
Emilien Mantel	59dd3997de	Acme uses light fake sites	2018-03-22 18:39:10 +01:00
Emilien Mantel	ae6dc88bc4	Delete current site when playing with acme.sh	2018-03-22 17:49:02 +01:00
Emilien Mantel	6719b415ab	Fix playbook crash whith acme and multiple domain	2018-03-22 17:47:53 +01:00
Emilien Mantel	fd21603a4d	Fix FreeBSD version for galaxy	2018-03-18 12:37:27 +01:00
Emilien Mantel	f52be2bbf3	Add FreeBSD in meta/main.yml	2018-03-17 14:52:14 +01:00
Emilien Mantel	a4aeec0a94	Drop check legacy nginx version	2018-03-17 14:08:48 +01:00
Emilien Mantel	713a2241de	Drop owncloud code	2018-03-17 14:04:48 +01:00
Emilien Mantel	6cae501266	Drop fastcgi_params supprort	2018-03-17 14:02:08 +01:00
Emilien Mantel	dd7834e8ce	Fix daemonize lock file (ngrok) It overwrited ngrok binary on Debian	2018-03-17 14:01:07 +01:00
Emilien Mantel	cb031c4014	Force shell for FreeBSD	2018-03-17 14:00:01 +01:00
Emilien Mantel	db97fe84f8	Add doc for FreeBSD	2018-03-17 12:54:57 +01:00
Emilien Mantel	c9629e385f	Working on FreeBSD 11/12	2018-03-17 12:24:19 +01:00
Emilien Mantel	5843d695b3	Manage FreeBSD 11	2018-03-16 21:56:15 +01:00
Emilien Mantel	8c7d581131	Fix php upstream with TCP socket	2018-03-16 18:53:53 +01:00
Emilien Mantel	0b85d81991	Better redirect management Fixes renew with letsencrypt (always redirect and never handle challenge)	2018-03-15 18:30:01 +01:00
Emilien Mantel	7fe08beb9a	Enable TLSv1.3 on nginx v1.13.0	2018-03-15 18:13:13 +01:00
Emilien Mantel	33ef161623	Ansible 2.4 must not fail now	2018-03-15 18:07:36 +01:00
Emilien Mantel	c2685732a4	Manages Ansible 2.4+ with Docker Closes #30	2018-03-15 18:06:38 +01:00
Emilien Mantel	737dfbeb30	Add debug mode	2018-03-15 16:10:37 +01:00
Emilien Mantel	def13392a7	Add Ansible 2.5 on travis	2018-03-15 12:56:12 +01:00
Emilien Mantel	6897f66344	redirect_from manages now https sites	2018-03-15 12:54:12 +01:00
Emilien Mantel	552999c782	Install modules on Debian 9+ or 8 with backports	2018-01-15 22:36:53 +01:00
Emilien Mantel	fe32f8d40a	Revert "minor fix" This reverts commit `5d46daaba8`.	2018-01-15 22:33:55 +01:00
Emilien Mantel	5d46daaba8	minor fix	2018-01-15 19:12:22 +01:00
Emilien Mantel	4ca8f9e319	Check nginx_version before install modules	2018-01-15 18:41:17 +01:00
Emilien Mantel	d3d9b5c296	Install modules OK	2017-12-14 20:06:29 +01:00
Emilien Mantel	45886ca9cc	Install modules just after nginx	2017-12-14 19:41:05 +01:00
Emilien Mantel	bb74ac804e	Donation	2017-12-09 17:05:02 +01:00
Emilien Mantel	2a5a1701f3	Try fix travis: php service not started	2017-12-07 12:40:16 +01:00
Emilien Mantel	a1866f806f	Fix test php_index2, fallback in /index.php	2017-12-07 11:14:19 +01:00
Emilien Mantel	0788b6c84f	Delete PHP upstream when nginx_php is empty Closes #31	2017-12-07 11:09:44 +01:00
Emilien Mantel	222998839c	Fix site.state == absent - Site is deleted now - Doc updated	2017-12-06 12:05:46 +01:00
Emilien Mantel	d00f3301e1	_php template, do not go to /index.php as fallback	2017-12-05 10:40:21 +01:00
Emilien Mantel	8f76b9c68c	acme.sh : no_log + fix check created	2017-12-03 02:15:48 +01:00
Emilien Mantel	8dca6c8404	Fix acme when acme_port is not defined	2017-12-03 02:08:32 +01:00
Emilien Mantel	a01f6cd5ea	Let's encript certificate with acme.sh	2017-12-03 01:32:56 +01:00
Emilien Mantel	609e4f013d	Fix crash when nginx_upstream is not set	2017-11-27 13:43:28 +01:00
Emilien Mantel	c79d370ad6	Add new site template: _php_index2	2017-11-27 13:34:03 +01:00
Emilien Mantel	45f800fe18	With Vagrant 2.* ansible.sudo -> ansible.become	2017-11-27 13:25:04 +01:00
Emilien Mantel	9fc4838b1b	Fix loop control	2017-11-03 11:06:57 +01:00
Emilien Mantel	3304934227	Add loop_control.label on site tasks	2017-11-03 10:56:18 +01:00
Emilien Mantel	57968b50c0	Restart nginx on SSL file writes	2017-11-03 10:30:24 +01:00
Emilien Mantel	8675d683ec	Tests with uri module (closes #25 )	2017-10-27 15:27:16 +02:00
Emilien Mantel	10bd837f54	Setup is now 'handled'	2017-10-26 15:50:59 +02:00
Emilien Mantel	332e28a9d7	YAML cleaning	2017-10-26 15:47:30 +02:00
Emilien Mantel	4b3b857733	Remove heavy code (nginx filename) using a filter	2017-10-26 15:33:00 +02:00
Emilien Mantel	608784ca55	Fix travis	2017-10-26 11:45:20 +02:00
Emilien Mantel	36652f4742	Move upstream templates to conf.d	2017-10-26 11:09:21 +02:00
Emilien Mantel	463ce45105	New PHP management - New versions (7.x) - PHP upstream name - Sites can use : default PHP version, select first one by PHP version, select by upstream name - Add PHP filter plugin	2017-10-26 11:04:38 +02:00
Emilien Mantel	70283ddcc6	Update .travis.yml Fix failures	2017-10-03 19:57:04 +02:00
Emilien Mantel	de40c07ac5	Better readability	2017-10-03 17:57:35 +02:00
Emilien Mantel	54dd1ef3c0	Remove legacy code	2017-10-03 17:38:06 +02:00
Emilien Mantel	cfe27ef245	Bypasses ansible 2.4.0.0 service issue On Ansible 2.4, it seems the service is not reloaded/restarted. This commit skips errors...	2017-10-03 17:35:35 +02:00
Emilien Mantel	6f098475e5	Remove useless vagrant boxes	2017-10-03 16:52:45 +02:00
Emilien Mantel	090875cbde	Travis changes - drop allow failure for stretch and ansible 2.3 - manages ansible 2.4	2017-09-26 09:44:52 +02:00
Emilien Mantel	b72263f7e5	Fix failures on travis	2017-07-27 14:56:43 +02:00
Emilien Mantel	4751eaa3c1	Add missing cont on Vagrant	2017-07-27 14:31:42 +02:00
Emilien Mantel	e83395271d	Fix tests for Debian Stretch - nagios is not available - curl can use HTTP2 (headers are lowercase) - bypass tests when htpasswd is empty (bypass issue #28)	2017-07-27 14:25:22 +02:00
Emilien Mantel	6935404939	Improve syntax readability	2017-07-27 12:21:10 +02:00
Emilien Mantel	acf8de8f87	Fix warning on when	2017-07-27 12:01:59 +02:00
Emilien Mantel	50e25d45b8	Elegent fail for htpasswd+stretch (#28 related)	2017-07-27 11:50:48 +02:00
Emilien Mantel	adf53b0d95	Fix redirect_to when filename is set	2017-07-25 17:00:34 +02:00
Emilien Mantel	4d819ac2a1	Add tags to ssl and site configuration	2017-07-19 15:57:41 +02:00
Emilien Mantel	af9fa6a2c3	Update stretch vagrant box (virtualbox)	2017-06-29 15:04:59 +02:00
Emilien Mantel	4486bddb19	Add blank lines, spaces... (readability)	2017-06-14 18:00:30 +02:00
Emilien Mantel	0b99a1c28e	Remove ansible 2.3 warnings - fixes #29	2017-06-14 17:54:48 +02:00
Emilien Mantel	d616657f12	travis: missing debian stretch + ansible 2.2	2017-06-09 09:48:24 +02:00
Emilien Mantel	eb0bdcad6f	Travis major changes: - Use Vagrant + Docker - Test multiple Ansible versions	2017-06-06 14:15:03 +02:00
Emilien Mantel	3ae791ec47	Role can be fully called in check mode	2017-06-01 11:38:22 +02:00
Emilien Mantel	cbdfc741ba	Renaming variables vhost -> site Vhost is an Apache configuration, not Nginx. Manages backward compatibility.	2017-04-25 12:27:08 +02:00
Emilien Mantel	a60e81cc1f	fix redirect https : show port only if not 443	2017-04-13 15:16:53 +02:00
Emilien Mantel	f1af8991fd	Bug fix : redirect https with many names On a multiple name vhost with redirect_https, redirection is done with the origin name not the main name.	2017-04-13 14:21:14 +02:00
Emilien Mantel	fcb59fd331	no_log when deleting htpasswd files	2017-03-14 11:21:35 +01:00
Emilien Mantel	2aa9e8b6b9	load modules uses pattern *.conf	2017-03-13 10:19:07 +01:00
Emilien Mantel	7892626fc0	Load module from {{nginx_dir}}/etc/modules-enabled	2017-03-13 09:53:29 +01:00