From f5fbc4b8f1216458117a21718f373c7b77fd8d2a Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Tue, 8 May 2018 23:39:59 +0300 Subject: [PATCH] roles/nginx: Use bionic builds on Ubuntu 18.04 NGINX finally published builds for Ubuntu 18.04 "bionic" so we don't need to use the 17.10 "artful" ones anymore. --- roles/nginx/templates/nginx_org_sources.list.j2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2 index d9b3d5b..0ba7c39 100644 --- a/roles/nginx/templates/nginx_org_sources.list.j2 +++ b/roles/nginx/templates/nginx_org_sources.list.j2 @@ -2,17 +2,9 @@ {% if ansible_distribution == 'Ubuntu' %} {% if nginx_version == "stable" %} -{% if ansible_distribution_version is version_compare('18.04', '==') %} -# 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_version is version_compare('18.04', '==') %} -# 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 %}