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

Added nginx repo key for mainline

Browse Source
This commit is contained in:
Juan Manuel 2015-02-10 17:20:52 -03:00
parent 88dfd0835c
commit 9de2a2631c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nginx/ng/install.sls
View File

@ -24,13 +24,14 @@ nginx_ppa_repo:
- humanname: nginx-ppa-{{ grains['oscodename'] }} - humanname: nginx-ppa-{{ grains['oscodename'] }}
{%- if nginx.ppa_version == 'mainline' %} {%- if nginx.ppa_version == 'mainline' %}
- name: deb http://nginx.org/packages/mainline/ubuntu/ {{ grains['oscodename'] }} nginx - name: deb http://nginx.org/packages/mainline/ubuntu/ {{ grains['oscodename'] }} nginx
- key_url: http://nginx.org/keys/nginx_signing.key
{%- else %} {%- else %}
- name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main - name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com
{%- endif %} {%- endif %}
- file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }} - dist: {{ grains['oscodename'] }}
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com
- require_in: - require_in:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in: