README improvement pour vhost.filename

Vhost state

.travis.yml

@@ -1,5 +1,4 @@
 env:
-  - PLATFORM=debian-wheezy
   - PLATFORM=debian-jessie
 
 sudo: required

README.md

@@ -1,7 +1,7 @@
 Nginx for Debian/FreeBSD Ansible role
 =====================================
 
-[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.nginx-blue.svg)](https://galaxy.ansible.com/list#/roles/4399) [![Build Status](https://travis-ci.org/HanXHX/ansible-nginx.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-nginx)
+[![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.nginx-blue.svg)](https://galaxy.ansible.com/HanXHX/nginx/) [![Build Status](https://travis-ci.org/HanXHX/ansible-nginx.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-nginx)
 
 Install and configure Nginx on Debian/FreeBSD.
 
@@ -40,6 +40,7 @@ FreeBSD:
 - `nginx_resolver`: list of DNS resolver (default: OpenDNS)
 - `nginx_error_log_level`: default log level
 - `nginx_auto_config_httpv2`: boolean, auto configure HTTP2 where possible
+- `nginx_fastcgi_fix_realpath`: boolean, use realpath for fastcgi (fix problems with symlinks and PHP opcache)
 
 ### Nginx Configuration
 

Vagrantfile

@@ -6,9 +6,8 @@
 Vagrant.configure("2") do |config|
 
   vms_debian = [
-    [ "debian-wheezy", "debian/wheezy64" ],
     [ "debian-jessie", "debian/jessie64" ],
-    [ "debian-stretch", "sharlak/debian_stretch_64" ],
+    [ "debian-stretch", "sharlak/debian_stretch_64" ]
   ]
 
   vms_freebsd = [

defaults/main.yml

@@ -18,6 +18,7 @@ nginx_error_log_level: 'warn' # http://nginx.org/en/docs/ngx_core_module.html#er
 nginx_auto_config_httpv2: true
 nginx_default_vhost: null
 nginx_default_vhost_ssl: null
+nginx_fastcgi_fix_realpath: true
 
 #
 # Nginx directories
@@ -31,9 +32,12 @@ nginx_helper_dir: '{{ nginx_etc_dir}}/helper'
 #
 
 # PHP
-nginx_php: false
+nginx_php56: false
-nginx_php_sockets:
+nginx_php70: false
-  - unix_socket: "/var/run/php5-fpm.sock"
+nginx_php56_sockets:
+  - unix_socket: "/run/php5-fpm.sock"
+nginx_php70_sockets:
+  - unix_socket: "/run/php/php7.0-fpm.sock"
 nginx_upstreams: []
 
 #
@@ -107,3 +111,10 @@ nginx_ssl_pairs: []
 nginx_dh: null
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
 nginx_dh_length: 2048
+
+# Extra
+
+# 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'

doc/php.md

@@ -1,8 +1,8 @@
 PHP
 ===
 
-- `nginx_php`: boolean if you need to preconfigure PHP (default: false)
+- `nginx_php56` and `nginx_php70`: boolean if you need to preconfigure PHP (default: false)
-- `nginx_php_sockets`: list of sockets (see bellow)
+- `nginx_php##_sockets`: list of sockets (see bellow)
 
 You should see [Nginx upstream module doc](http://nginx.org/en/docs/http/ngx_http_upstream_module.html).
 
@@ -15,4 +15,4 @@ Each socket have:
 - `max_fails`
 - `fail_timeout`
 
-With default configuration, it works fine with PHP-FPM. But if you install PHP7 with Dotdeb, path changed between version, you must set well this list.
+With default configuration, it works fine with PHP-FPM.

doc/upstream.md

@@ -11,6 +11,7 @@ Upstream params
 - `name`: upstream name. Can be use in vhost with *proxy_pass http://upstream_name*
 - `params`: list of param (hash, zone...)
 - `servers`: each upstream MUST have at least 1 server
+- `state`: Optional. Can be 'absent' or 'present'
 
 Server params
 -------------
@@ -38,4 +39,5 @@ nginx_upstreams:
         max_conns: 150
         weight: 10
         down: false
+    state: 'present'
 ```

doc/vhost.md

@@ -10,12 +10,11 @@ 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`.
-- `filename`: (O) Specify filename in /etc/nginx/sites-*. Do NOT specify default (reserved keyword).
+- `filename`: (O) Specify filename in /etc/nginx/sites-*. Do NOT specify default (reserved keyword). It will be used for log filenames and directories creation.
-- `enable`: (O) Enable the vhost (default is true)
+- `state`: (O) Vhost status. Can be "present" (default), "absent" and "disabled".
-- `delete`: (O) Delete the vhost (default is false)
 - `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.
+- `headers`: (O) Set additionals header as key/value list. You can append "always" to the value. Show [nginx doc](http://nginx.org/en/docs/http/ngx_http_headers_module.html).
 - `redirect_to_code`: Redirect code (default: 302)
 - `redirect_https`: (O) Boolean. Redirect HTTP to HTTPS. If "true", you _MUST_ set `proto` to ```['https']```.
 - `location`: (O) Add new custom locations (it does not overwrite!)
@@ -26,6 +25,8 @@ Common
 - `htpasswd`: (O) References name key in `nginx_htpasswd`. Enable auth basic on all vhost.
 - `proto`: (O) list of protocol used. Default is a list with "http". If you need http and https, you must set a list with "http" and "https". You can only set "https" without http support.
 - `ssl_name`: (D) name of the key used when using TLS/SSL. Mandatory when `proto` contains "https"
+- `ssl_template` (O) "strong" (default) or "legacy". You can disable SSL helpers and add your own directives by setting "false". 
+- `php_version` (O) Sepecify PHP version (5 or 7)
 
 (O): Optional
 (M): Mandatory
@@ -39,6 +40,7 @@ Templates
 - `_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

handlers/main.yml

@@ -1,4 +1,13 @@
 ---
 
+# Reload wrapper
 - name: reload nginx
-  action: service name=nginx state=reloaded enabled=yes
+  command: nginx -t
+  notify: real-reload nginx
+
+- name: real-reload nginx
+  service: name=nginx state=reloaded
+
+- name: restart nginx freebsd
+  service: name=nginx state=restarted
+  when: ansible_distribution == "FreeBSD"

meta/main.yml

@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
   - name: Debian
     versions:
-    - wheezy
     - jessie
   - name: FreeBSD
     versions:

tasks/config.yml

@@ -19,3 +19,16 @@
     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:
+    -
+      - 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' ]
+  when: nginx_fastcgi_fix_realpath

tasks/install_Debian.yml

@@ -5,6 +5,13 @@
     update_cache=yes
     cache_valid_time=3600
 
+- name: APT | Force OpenSSL from backports (fix dependency break)
+  apt: >
+    pkg=openssl
+    state=latest
+    default_release={{ ansible_distribution_release + '-backports' }}
+  when: nginx_backports
+
 - name: APT | Install nginx and dependencies
   apt: >
     pkg={{ nginx_apt_package }}

tasks/install_FreeBSD.yml

@@ -33,3 +33,14 @@
   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
+
+- name: SERVICE | Enable nginx
+  service: name=nginx enabled=yes

tasks/main.yml

@@ -1,6 +1,5 @@
 ---
 
-
 - name: INCLUDE_VARS | Related to OS
   include_vars: "{{ ansible_distribution }}.yml"
 

tasks/upstream.yml

@@ -1,10 +1,15 @@
 ---
 
+- 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_php
+  when: nginx_php56 or nginx_php70
   notify: reload nginx
 
 - name: TEMPLATE | Deploy other upstreams
@@ -12,4 +17,13 @@
     src=etc/nginx/upstream/upstream.conf.j2
     dest={{ nginx_etc_dir }}/conf.d/upstream-{{ item.name }}.conf
   with_items: "{{ 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
+  with_items: "{{ nginx_upstreams }}"
+  when: item.state is defined and item.state == 'absent'
   notify: reload nginx

tasks/vhost.yml

@@ -27,7 +27,7 @@
 
 - name: FILE | Create root public folders (foreach nginx_vhosts)
   file: >
-    path={{ nginx_root }}/{{ item.name if item.name is string else item.name[0] }}/public
+    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) }}
@@ -36,7 +36,7 @@
   when: >
     item.root is not defined and
     (item.template is defined and item.template not in nginx_templates_no_dir) and
-    (item.delete is not defined or not item.delete) and
+    (item.state is not defined or not item.state != 'absent') and
     item.redirect_to is not defined
 
 - name: TEMPLATE | Create vhosts
@@ -44,14 +44,14 @@
     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
+  notify: ['reload nginx', 'restart nginx freebsd']
-  when: item.delete is not defined or not item.delete
+  when: item.state is not defined or item.state != 'absent'
 
 - name: FILE | Delete vhosts
   file: path={{ nginx_etc_dir }}/sites-available/{{ item.filename | default(item.name if item.name is string else item.name[0]) }} state=absent
   with_items: "{{ nginx_vhosts }}"
-  notify: reload nginx
+  notify: ['reload nginx', 'restart nginx freebsd']
-  when: item.delete is defined and item.delete
+  when: item.state is defined and item.state == 'absent'
 
 - name: FILE | Enable vhosts
   file: >
@@ -59,23 +59,21 @@
     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
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: >
-    ((item.enable is not defined) or
+    item.state is not defined or item.state == 'present'
-    (item.enable is defined and item.enable)) and
-    (item.delete is not defined or not item.delete)
 
 - 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
+  notify: ['reload nginx', 'restart nginx freebsd']
-  when: (item.enable is defined and not item.enable) or (item.delete is defined and item.delete)
+  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
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: nginx_default_vhost is not none
 
 - name: FILE | Auto set default vhost
@@ -83,5 +81,5 @@
     src={{ nginx_etc_dir }}/sites-available/default
     dest={{ nginx_etc_dir }}/sites-enabled/default
     state=link
-  notify: reload nginx
+  notify: ['reload nginx', 'restart nginx freebsd']
   when: nginx_default_vhost is none

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

@@ -2,11 +2,11 @@
 # {{ ansible_managed }}
 #
 
-ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+ssl_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_prefer_server_ciphers on;
 ssl_session_cache shared:SSL:10m;
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+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') %}
 ssl_stapling on;
 ssl_stapling_verify on;

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

@@ -2,11 +2,11 @@
 # {{ ansible_managed }}
 #
 
-ssl_ciphers "AES256+EECDH:AES256+EDH";
+ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
 ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 ssl_prefer_server_ciphers on;
 ssl_session_cache shared:SSL:10m;
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+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') %}
 ssl_stapling on;
 ssl_stapling_verify on;

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

@@ -1,9 +1,9 @@
 {% set __proto = item.proto | default(['http']) %}
-{% set __main_name =  item.name if item.name is string else item.name[0] %}
+{% 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 __location = item.location | default({}) %}
-{% set __headers = item.headers | default({'X-Frame-Options': 'DENY', 'X-Content-Type-Options': 'nosniff' }) %}
+{% set __headers = item.headers | default({'X-Frame-Options': 'DENY always', 'X-Content-Type-Options': 'nosniff always' }) %}
 {% macro htpasswd(htpasswd_name, indent=1) -%}
 {% for ht in nginx_htpasswd if ht.name == htpasswd_name %}
 {{ "\t" * indent }}auth_basic "{{ ht.description }}";
@@ -34,9 +34,11 @@ server {
 	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 %};
 {% endfor %}
 {{ ssl(item.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.name is string %}{{ item.name }}{% else %}{{ item.name | join(' ') }}{% endif %};
+{% endif %}
+	server_name {% if item.name is string %}{{ item.name }}{% else %}{{ "\n\t\t"  }}{{ item.name | join("\n\t\t") }}{% endif %};
 {% block root %}
 {% if item.root is defined %}
 	root {{ item.root }};
@@ -48,21 +50,25 @@ server {
 	index {{ item.index | default('index.html index.htm') }};
 {% endblock %}
 
+{% block template_more %}
 {% if item.more is defined and item.more is iterable %}
 {% for line in item.more %}
 	{{ line }}
 {% endfor %}
 {% endif %}
+{% endblock %}
 
 {% if item.htpasswd is defined %}
 {{ htpasswd(item.htpasswd, 1) }}
 {% endif %}
 
+{% block template_headers %}
 	# --> Custom headers
 {% for key, value in __headers.iteritems() %}
-	add_header {{ key }} {{ value }};
+	add_header {{ key }} {{ value | replace(' always', '') }}{% if nginx_version.stdout | version_compare('1.7.5', 'ge') and ' always' in value %} always{% endif %};
 {% endfor %}
 	# <-- Custom headers
+{% endblock %}
 
 {% if not __location.has_key('/') %}
 	location / {
@@ -77,6 +83,19 @@ server {
 {% block template_custom_location %}
 {% endblock %}
 
+{% if __location is iterable and __location | length > 0 %}
+	# --> Custom locations
+{% for location, opts in __location.iteritems() %}
+	location {{ location }} {
+{% for opt in opts %}
+{% if opt.htpasswd is defined %}{{ htpasswd(opt.htpasswd, 2) }}{% else %}
+		{{ opt }}
+{% endif %}
+{% endfor  %}
+	}
+{% endfor %}	# <-- Custom locations
+{% endif %}
+
 {% block template_local_content %}
 {% if item.manage_local_content is not defined or item.manage_local_content %}
 	location ~ /\.ht {
@@ -96,19 +115,6 @@ server {
 {% endif %}
 {% endblock %}
 
-{% if __location is iterable and __location | length > 0 %}
-	# --> Custom locations
-{% for location, opts in __location.iteritems() %}
-	location {{ location }} {
-{% for opt in opts %}
-{% if opt.htpasswd is defined %}{{ htpasswd(opt.htpasswd, 2) }}{% else %}
-		{{ opt }}
-{% endif %}
-{% endfor  %}
-	}
-{% endfor %}	# <-- Custom locations
-{% endif %}
-
 {% if item.use_access_log is defined %}
 {% if item.use_access_log %}
 	access_log {{ nginx_log_dir }}/{{ __main_name }}_access.log combined;

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

@@ -1,4 +1,4 @@
-{% extends "_base.j2" %}
+{% extends "_php.j2" %}
 
 {% block root %}
 	root {{ nginx_nagios_root }};
@@ -11,6 +11,20 @@
 	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;
@@ -42,7 +56,7 @@
 		fastcgi_param REMOTE_USER $remote_user;
 	}
 	location ~ \.php$ {
-		fastcgi_pass php;
+		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 		include fastcgi_params;

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

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

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

@@ -1,4 +1,24 @@
 {% extends "_base.j2" %}
+
+{% macro phpv(version) %}
+{% if version == 56 or version == "5.6" %}
+{{ nginx_upstream_php56 -}}
+{% elif 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) %}
+{% endif %}
+
 {% block template_index %}
 	index {{ item.index | default('index.html index.htm index.php') }};
 {% endblock %}
@@ -9,7 +29,7 @@
 
 {% block template_upstream_location %}
 	location ~ \.php$ {
-		fastcgi_pass php;
+		fastcgi_pass {{ php_upstream }};
 		fastcgi_index index.php;
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}

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

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

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

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

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

@@ -2,8 +2,9 @@
 # {{ ansible_managed }}
 #
 
-upstream php {
+{% if nginx_php56 %}
-{% for item in nginx_php_sockets %}
+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 %}
@@ -12,4 +13,18 @@ upstream php {
 {% 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

tests/debian-wheezy.Dockerfile

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

tests/includes/post_Debian.yml

@@ -1,10 +1,11 @@
 ---
 
 - name: APT | Install web apps
-  apt: pkg={{ item }} state=present
+  apt: pkg={{ item }} state=present install_recommends=no
   with_items:
-    - nagios3
     - backuppc
+    - nagios3
+#    - owncloud
 
 - name: SERVICE | Ensure backuppc is started
   service: name=backuppc state=started

tests/includes/pre_Debian.yml

@@ -3,20 +3,34 @@
 - name: APT_REPOSITORY | Install backports
   apt_repository: repo='deb http://httpredir.debian.org/debian {{ ansible_distribution_release }}-backports main' state=present
 
+- block:
+  - name: APT | Install DotDeb key
+    apt_key: url='http://www.dotdeb.org/dotdeb.gpg' state=present
+  - name: APT_REPOSITORY | Install dotdeb (PHP 7) 
+    apt_repository: repo='deb http://packages.dotdeb.org {{ ansible_distribution_release }} all' state=present
+  - name: LINEFILEFILE | Dotdeb priority (prevent install nginx from dotdeb)
+    copy: >
+      content="Package: *\nPin: release o=packages.dotdeb.org\nPin-Priority: 100"
+      dest=/etc/apt/preferences
+  when: ansible_distribution_release == 'jessie'
+
 - name: APT | Install needed packages
   apt: pkg={{ item }} update_cache=yes cache_valid_time=3600 state=present
   with_items:
-    - php5-fpm
     - curl
     - fcgiwrap
-
+    - nghttp2
-- name: APT | Install nghttp2
+    - php5-fpm
-  apt: pkg=nghttp2 state=present
+    - php5-sqlite
-  when: ansible_distribution_major_version | version_compare(8, 'ge')
+    - php7.0-fpm
+    - php7.0-sqlite3
+    - strace
+    - vim
 
 - name: SERVICE | Force start services
   service: name={{ item }} state=started
   register: sf
   with_items:
     - php5-fpm
+    - php7.0-fpm
     - fcgiwrap

tests/includes/pre_FreeBSD.yml

@@ -4,7 +4,8 @@
   set_fact:
     nginx_pkgng_package: 'nginx-devel'
     nginx_user: 'www'
-    nginx_php_sockets:
+    nginx_php70: false
+    nginx_php56_sockets:
       - host: '127.0.0.1'
         port: 9000
 

tests/inventory

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

tests/test.sh

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

tests/test.yml

@@ -15,8 +15,10 @@
     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_backports: true
-    nginx_php: true
+    nginx_php56: true
+    nginx_php70: true
     nginx_upstreams:
       - name: 'test'
         servers:
@@ -24,6 +26,13 @@
             max_conns: 150
             weight: 10
             down: false
+      - name: 'test-absent'
+        servers:
+          - path: '127.0.0.1:80'
+            max_conns: 150
+            weight: 10
+            down: false
+        state: 'absent'
     nginx_htpasswd:
       - name: 'hello'
         description: 'Please login!'
@@ -97,7 +106,7 @@
           -----END CERTIFICATE-----
     nginx_custom_http:
       - 'add_header X-ansible 1;'
-    nginx_default_vhost: 'test.local'
+    nginx_default_vhost: 'first-test'
     nginx_default_vhost_ssl: 'test-ssl-predeployed.local'
     nginx_vhosts:
       - name:
@@ -108,10 +117,10 @@
         filename : 'first-test'
         override_try_files: '$uri $uri index.htm index.html'
         headers:
-          'X-Frame-Options': 'deny'
+          'X-Frame-Options': 'deny always'
           'X-ansible-default': '1'
         manage_local_content: false
-        use_error_log: false
+        use_error_log: true
         more:
           - 'autoindex off;'
         location:
@@ -138,6 +147,7 @@
           '/':
             - 'alias /var/tmp;'
       - name: 'test-php.local'
+        php_version: 70
         upstream_params:
           - 'fastcgi_param FOO bar;'
         redirect_from:
@@ -152,10 +162,10 @@
           - 8080
         template: '_proxy'
         upstream_name: 'test'
-        more:
+        headers:
-          - 'add_header X-proxyfied 1;'
+          'X-proxyfied': '1'
       - name: 'deleted.local'
-        delete: true
+        state: 'absent' 
       - name: 'redirect-to.local'
         redirect_to: 'http://test.local'
       - name: 'backuppc.local'
@@ -172,13 +182,16 @@
         proto: ['http', 'https']
         template: '_base'
         ssl_name: 'test-ssl-predeployed.local'
-        more:
+        headers:
-          - 'add_header X-ansible-default 1;'
+          'X-ansible-default': '1'
+        ssl_template: false
       - name: 'test-ssl-redirect.local'
         proto: ['https']
         template: '_base'
         ssl_name: 'test-ssl.local'
         redirect_https: true
+#      - name: 'owncloud.local'
+#        template: '_owncloud'
     nginx_dh_length: 1024
   roles:
     - ../../
@@ -196,7 +209,7 @@
       with_items: ['test-php.local', 'test-php-index.local']
     - name: -- Add HTML file --
       copy: dest="{{ item }}/index.html" content="Index HTML test OK\n"
-      with_items: ['{{ nginx_root }}/test.local/public', '/var/tmp', '{{ nginx_root }}/test-htpasswd-all.local/public', '{{ nginx_root }}/test-ssl.local/public', '{{ nginx_root }}/test-ssl-predeployed.local/public']
+      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']
     - name: -- Create directory --
       file: path={{ nginx_root }}/test-htpasswd.local/public/hello state=directory
     - name: -- Add HTML file hello --
@@ -207,7 +220,7 @@
     - name: -- VERIFY VHOSTS --
       command: "curl -H 'Host: {{ item.name if item.name is string else item.name[0] }}' http://127.0.0.1{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
       with_items: "{{ nginx_vhosts }}"
-      when: item.delete is undefined or not item.delete
+      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"
@@ -217,7 +230,7 @@
     - name: -- VERIFY REDIRECT VHOSTS --
       command: "curl -H 'Host: {{ item.redirect_from[0] }}' http://127.0.0.1/"
       with_items: "{{ nginx_vhosts }}"
-      when: item.redirect_from is defined and (item.delete is undefined or not item.delete)
+      when: item.redirect_from is defined and (item.state is undefined or item.state != "absent")
       changed_when: false
       register: r
       failed_when: r.stdout.find('301 Moved Permanently') == -1
@@ -232,6 +245,20 @@
       failed_when: p.stdout.find('PHP Version') == -1
       with_items: ['test-php.local', 'test-php-index.local']
 
+    - name: -- VERIFY PHP5 VHOSTS (implicit default) --
+      command: "curl -H 'Host: {{ item }}' http://127.0.0.1/"
+      register: p
+      changed_when: false
+      failed_when: p.stdout.find('PHP Version 5') == -1
+      with_items: ['test-php-index.local']
+
+    - 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']
+
 # --------------------------------
 # Basic Auth
 # --------------------------------
@@ -285,6 +312,27 @@
       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'
+
 # --------------------------------
 # SSL
 # --------------------------------

vars/main.yml

@@ -28,6 +28,10 @@ nginx_dirs:
   - "{{ nginx_helper_dir }}"
 
 nginx_templates_no_dir:
-  - '_proxy'
-  - '_nagios3'
   - '_backuppc'
+  - '_nagios3'
+  - '_owncloud'
+  - '_proxy'
+
+nginx_upstream_php56: 'php56'
+nginx_upstream_php70: 'php70'