saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #207 from noelmcloughlin/fixes3

Browse Source 
Enforce PPA's on Ubuntu(s) only; not Debian
This commit is contained in:
Niels Abspoel 2019-01-25 19:50:23 +01:00 committed by GitHub
commit 60b8e74bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nginx/ng/pkg.sls
View File

@ -51,6 +51,8 @@ nginx_official_repo:
- watch_in: - watch_in:
- pkg: nginx_install - pkg: nginx_install
{%- if grains.os not in ('Debian',) %}
## applies to Ubuntu and derivatives only #}
nginx_ppa_repo: nginx_ppa_repo:
pkgrepo: pkgrepo:
{%- if from_ppa %} {%- if from_ppa %}
@ -69,6 +71,7 @@ nginx_ppa_repo:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in:
- pkg: nginx_install - pkg: nginx_install
{%- endif %}
nginx_phusionpassenger_repo: nginx_phusionpassenger_repo:
pkgrepo: pkgrepo: