Fix ppa install for Debian

On Ubuntu, you can take advantage of Personal Package Archives on Launchpad simply by specifying the user and archive name.  On other apt-based systems this must be the complete entry as it would be seen in the sources.list file.
This commit is contained in:
George Robinson 2016-04-20 12:36:46 +01:00
parent 01c713a2da
commit 6d84de272f

View File

@ -35,7 +35,13 @@ nginx_ppa_repo:
{%- else %} {%- else %}
- absent - absent
{%- endif %} {%- endif %}
{% if salt['grains.get']('os') == 'Ubuntu' %}
- ppa: nginx/{{ nginx.ppa_version }} - ppa: nginx/{{ nginx.ppa_version }}
{% else %}
- name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu lucid main
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com
{% endif %}
- require_in: - require_in:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in: