roles/nginx: Update apt sources for Ubuntu now that nginx 1.10.0 is out

This commit is contained in:
Alan Orth 2016-04-27 15:04:17 +03:00
parent 38a972e085
commit 447db17e33
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9

View File

@ -1,4 +1,4 @@
{% if ansible_distribution_version == '14.04' %} {% if ansible_distribution == 'Ubuntu' %}
{% if nginx_version == "stable" %} {% if nginx_version == "stable" %}
deb http://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx deb http://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx
{% elif nginx_version == "mainline" %} {% elif nginx_version == "mainline" %}
@ -6,16 +6,6 @@ deb http://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if ansible_distribution_version == '16.04' %}
# There are no nginx.org builds for Ubuntu 16.04 (xenial) yet, so use 15.10 (wily)
{% if nginx_version == "stable" %}
deb http://nginx.org/packages/ubuntu/ wily nginx
{% elif nginx_version == "mainline" %}
# There are no "mainline" nginx.org builds for Ubuntu 16.04 (xenial) yet, so use 15.10 (wily)
deb http://nginx.org/packages/mainline/ubuntu/ wily nginx
{% endif %}
{% endif %}
{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' %} {% if ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' %}
{% if nginx_version == "stable" %} {% if nginx_version == "stable" %}
deb http://nginx.org/packages/debian/ jessie nginx deb http://nginx.org/packages/debian/ jessie nginx