From 447db17e33b2583c6b4f0956d7c95ff9e708c93f Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Wed, 27 Apr 2016 15:04:17 +0300 Subject: [PATCH] roles/nginx: Update apt sources for Ubuntu now that nginx 1.10.0 is out --- roles/nginx/templates/nginx_org_sources.list.j2 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2 index 092e694..23ea97d 100644 --- a/roles/nginx/templates/nginx_org_sources.list.j2 +++ b/roles/nginx/templates/nginx_org_sources.list.j2 @@ -1,4 +1,4 @@ -{% if ansible_distribution_version == '14.04' %} +{% if ansible_distribution == 'Ubuntu' %} {% if nginx_version == "stable" %} deb http://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx {% elif nginx_version == "mainline" %} @@ -6,16 +6,6 @@ deb http://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release } {% 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 nginx_version == "stable" %} deb http://nginx.org/packages/debian/ jessie nginx