From 4900d96a29fe1995fcf7b2bfd0e46836e4728037 Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Mon, 17 Oct 2016 11:36:29 -0500 Subject: [PATCH 1/2] Use oscodename grain instead of hard coded trusty --- nginx/ng/pkg.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nginx/ng/pkg.sls b/nginx/ng/pkg.sls index 7f149d4..79279b1 100644 --- a/nginx/ng/pkg.sls +++ b/nginx/ng/pkg.sls @@ -34,7 +34,8 @@ nginx_ppa_repo: {% if salt['grains.get']('os') == 'Ubuntu' %} - ppa: nginx/{{ nginx.ppa_version }} {% else %} - - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu trusty main + - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main + #- name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu trusty main - keyid: C300EE8C - keyserver: keyserver.ubuntu.com {% endif %} From ce2e8ea03b110ebc79acc895d166c93f5d4f1569 Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Tue, 17 Jan 2017 15:11:33 +0000 Subject: [PATCH 2/2] Cleaned up comment Removed comment after testing that this change works with xenial --- nginx/ng/pkg.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/nginx/ng/pkg.sls b/nginx/ng/pkg.sls index 79279b1..35baaf1 100644 --- a/nginx/ng/pkg.sls +++ b/nginx/ng/pkg.sls @@ -35,7 +35,6 @@ nginx_ppa_repo: - ppa: nginx/{{ nginx.ppa_version }} {% else %} - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main - #- name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu trusty main - keyid: C300EE8C - keyserver: keyserver.ubuntu.com {% endif %}