Drop Jessie support
parent
91ca31e676
commit
5ed17149e5
|
@ -1,12 +1,6 @@
|
|||
env:
|
||||
- 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'
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ Supported OS:
|
|||
|
||||
| OS | Working | Stable (active support) |
|
||||
| ------------------ | ------- | ----------------------- |
|
||||
| Debian Jessie (8) | Yes | Yes |
|
||||
| Debian Jessie (8) | Yes | Check latest supported version ([1.5.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.5.0)) |
|
||||
| Debian Stretch (9) | Yes | Yes |
|
||||
| FreeBSD 11 | Yes | No |
|
||||
| FreeBSD 12 | Yes | No |
|
||||
|
@ -30,7 +30,7 @@ Supported OS:
|
|||
Requirements
|
||||
------------
|
||||
|
||||
Ansible 2.5+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
|
||||
Ansible 2.6+. If you set true to `nginx_backports`, you must install backports repository before lauching this role.
|
||||
|
||||
Role Variables
|
||||
--------------
|
||||
|
|
|
@ -6,9 +6,6 @@
|
|||
Vagrant.configure("2") do |config|
|
||||
|
||||
vms_debian = [
|
||||
{ :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 }}
|
||||
]
|
||||
|
@ -19,9 +16,6 @@ Vagrant.configure("2") do |config|
|
|||
]
|
||||
|
||||
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 }}
|
||||
]
|
||||
|
|
|
@ -39,7 +39,7 @@ Templates
|
|||
---------
|
||||
|
||||
- `_base`: static template
|
||||
- `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/jessie/fcgiwrap))
|
||||
- `_backuppc`: access to [BackupPC](http://backuppc.sourceforge.net/) (be careful: you need to install [fcgiwrap](https://packages.debian.org/stretch/fcgiwrap))
|
||||
- `_dokuwiki`
|
||||
- `_redirect`: should not be called explicitly
|
||||
- `_phalcon`: Phalcon PHP Framework
|
||||
|
|
|
@ -3,8 +3,6 @@ Upstream management
|
|||
|
||||
`nginx_upstreams`: List of dict. An upstream has few keys. See bellow.
|
||||
|
||||
Note: Few params are unavailable on old Nginx version. But this role do _not_ put it if your version is too old!
|
||||
|
||||
Upstream params
|
||||
---------------
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ galaxy_info:
|
|||
platforms:
|
||||
- name: Debian
|
||||
versions:
|
||||
- jessie
|
||||
- stretch
|
||||
- name: FreeBSD
|
||||
versions:
|
||||
|
|
|
@ -23,9 +23,6 @@
|
|||
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:
|
||||
|
|
|
@ -9,7 +9,7 @@ ssl_session_cache shared:SSL:10m;
|
|||
ssl_session_tickets off;
|
||||
ssl_stapling on;
|
||||
ssl_stapling_verify on;
|
||||
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
|
||||
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
|
||||
resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
|
||||
resolver_timeout {{ nginx_resolver_timeout }};
|
||||
ssl_dhparam {{ nginx_dh_path }};
|
||||
|
|
|
@ -11,7 +11,7 @@ ssl_session_cache shared:SSL:10m;
|
|||
ssl_session_tickets off;
|
||||
ssl_stapling on;
|
||||
ssl_stapling_verify on;
|
||||
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"{% if nginx_version.stdout is version('1.7.5', 'ge') %} always{% endif %};
|
||||
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
|
||||
resolver {{ nginx_resolver_hosts | join(' ') }} valid={{ nginx_resolver_valid }};
|
||||
resolver_timeout {{ nginx_resolver_timeout }};
|
||||
ssl_dhparam {{ nginx_dh_path }};
|
||||
|
|
|
@ -5,9 +5,7 @@
|
|||
user {{ nginx_user }};
|
||||
worker_processes {{ nginx_worker_processes }};
|
||||
pid {{ nginx_pid }};
|
||||
{% if nginx_version.stdout is version('1.9.11', 'ge') %}
|
||||
include {{ nginx_etc_dir }}/modules-enabled/*.conf;
|
||||
{% endif %}
|
||||
|
||||
events {
|
||||
worker_connections {{ nginx_events_worker_connections }};
|
||||
|
|
|
@ -83,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 is version('1.7.5', 'ge') and ' always' in value %} always{% endif %};
|
||||
add_header {{ key }} "{{ value }}";
|
||||
{% endfor %}
|
||||
# <-- Custom headers
|
||||
{% endblock %}
|
||||
|
|
|
@ -6,25 +6,6 @@
|
|||
state: present
|
||||
when: nginx_backports
|
||||
|
||||
- block:
|
||||
|
||||
- name: APT | Install DotDeb key
|
||||
apt_key:
|
||||
url: 'http://www.dotdeb.org/dotdeb.gpg'
|
||||
state: present
|
||||
|
||||
- name: APT_REPOSITORY | Install dotdeb (PHP 7)
|
||||
apt_repository:
|
||||
repo: 'deb http://packages.dotdeb.org {{ ansible_distribution_release }} all'
|
||||
state: present
|
||||
|
||||
- name: LINEFILEFILE | Dotdeb priority (prevent install nginx from dotdeb)
|
||||
copy:
|
||||
content: "Package: *\nPin: release o=packages.dotdeb.org\nPin-Priority: 100"
|
||||
dest: /etc/apt/preferences
|
||||
|
||||
when: ansible_distribution_release == 'jessie' and dotdeb | default(false)
|
||||
|
||||
- block:
|
||||
|
||||
- name: APT | Install apt-transport-https
|
||||
|
|
Loading…
Reference in New Issue