From 5c3553e684d113e51bcae28c629bf5ecfaae934d Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sat, 17 Mar 2018 13:46:42 +0200 Subject: [PATCH] roles/nginx: Use Ubuntu 17.10's packages on Ubuntu 18.04 There are no nginx packages for Ubuntu 18.04 "bionic" yet so we should use Ubuntu 17.10 "artful". --- roles/nginx/templates/nginx_org_sources.list.j2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2 index 23763e7..ca10562 100644 --- a/roles/nginx/templates/nginx_org_sources.list.j2 +++ b/roles/nginx/templates/nginx_org_sources.list.j2 @@ -2,11 +2,21 @@ {% if ansible_distribution == 'Ubuntu' %} {% if nginx_version == "stable" %} +{% if ansible_distribution_release == 'bionic' %} +# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" +deb https://nginx.org/packages/ubuntu/ artful nginx +{% else %} deb https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx +{% endif %} {% elif nginx_version == "mainline" %} +{% if ansible_distribution_release == 'bionic' %} +# 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" +deb https://nginx.org/packages/mainline/ubuntu/ artful nginx +{% else %} deb https://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }} nginx {% endif %} {% endif %} +{% endif %} {% if ansible_distribution == 'Debian' %} {% if nginx_version == "stable" %}