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

Added option to use 'development' ppa

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

2
nginx/ng/install.sls
View File

@ -26,7 +26,7 @@ nginx_ppa_repo:
- 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 - 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/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main
- keyid: C300EE8C - keyid: C300EE8C
- keyserver: keyserver.ubuntu.com - keyserver: keyserver.ubuntu.com
{%- endif %} {%- endif %}

2
pillar.example
View File

@ -23,7 +23,7 @@ nginx:
ng: ng:
# PPA installing # PPA installing
install_from_ppa: True install_from_ppa: True
# Set to 'mainline' for edge nginx builds # Set to 'mainline' for edge nginx builds, 'development' for ubuntu's dev - beware, mainline has no 'full' build
ppa_version: 'stable' ppa_version: 'stable'
# These are usually set by grains in map.jinja # These are usually set by grains in map.jinja