From 16a0bb90864af42ba67052ea49d03eedca96b877 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Mon, 1 Jun 2015 14:49:05 +0300 Subject: [PATCH] roles/nginx: Use utopic (14.10) nginx builds on 15.04 Upstream hasn't made 15.04 builds yet... Signed-off-by: Alan Orth --- .../nginx/templates/nginx_org_packages_ubuntu.list.j2 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/roles/nginx/templates/nginx_org_packages_ubuntu.list.j2 b/roles/nginx/templates/nginx_org_packages_ubuntu.list.j2 index 76b3159..441bd85 100644 --- a/roles/nginx/templates/nginx_org_packages_ubuntu.list.j2 +++ b/roles/nginx/templates/nginx_org_packages_ubuntu.list.j2 @@ -1,5 +1,16 @@ +{% if ansible_distribution_version == '14.04' %} {% if nginx_version == "stable" %} deb http://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx {% elif nginx_version == "mainline" %} deb http://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }} nginx {% endif %} +{% endif %} + +{% if ansible_distribution_version == '15.04' %} +# There are no nginx.org builds for Ubuntu 15.04 (vivid) yet, so use 14.10 (utopic) +{% if nginx_version == "stable" %} +deb http://nginx.org/packages/ubuntu/ utopic nginx +{% elif nginx_version == "mainline" %} +deb http://nginx.org/packages/mainline/ubuntu/ utopic nginx +{% endif %} +{% endif %}