Merge pull request #115 from grobinson-blockchain/master

Fix ppa install for Debian
2016-04-20 09:33:50 -07:00 · 2016-04-20 09:33:50 -07:00 · 89d07fed8b
commit 89d07fed8b
parent 01c713a2da 59bb5abb00
1 changed files with 6 additions and 0 deletions
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@ -35,7 +35,13 @@ nginx_ppa_repo:
    {%- else %}
    - absent
    {%- endif %}
+    {% 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
+    - keyid: C300EE8C
+    - keyserver: keyserver.ubuntu.com
+    {% endif %}
    - require_in:
      - pkg: nginx_install
    - watch_in: