Merge pull request #141 from chris-sanders/chris

Use oscodename instead of hard coded trusty for deb
This commit is contained in:
Niels Abspoel 2017-01-17 21:59:57 +01:00 committed by GitHub
commit 6512516154

View File

@ -34,7 +34,7 @@ nginx_ppa_repo:
{% if salt['grains.get']('os') == 'Ubuntu' %} {% if salt['grains.get']('os') == 'Ubuntu' %}
- ppa: nginx/{{ nginx.ppa_version }} - ppa: nginx/{{ nginx.ppa_version }}
{% else %} {% 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
- keyid: C300EE8C - keyid: C300EE8C
- keyserver: keyserver.ubuntu.com - keyserver: keyserver.ubuntu.com
{% endif %} {% endif %}