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

Choose mainline/stable from ppa at will

Browse Source
This commit is contained in:
Juan Manuel 2015-02-10 16:59:49 -03:00
parent f2091b464f
commit afc723802d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/ng/install.sls
View File

@ -22,8 +22,8 @@ nginx_ppa_repo:
- absent - absent
{%- endif %} {%- endif %}
- humanname: nginx-ppa-{{ grains['oscodename'] }} - humanname: nginx-ppa-{{ grains['oscodename'] }}
- 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
- file: /etc/apt/sources.list.d/nginx-stable-{{ grains['oscodename'] }}.list - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }} - dist: {{ grains['oscodename'] }}
- keyid: C300EE8C - keyid: C300EE8C
- keyserver: keyserver.ubuntu.com - keyserver: keyserver.ubuntu.com

1
nginx/ng/map.jinja
View File

@ -27,6 +27,7 @@
}, default='Debian' ), }, default='Debian' ),
'install_from_source': False, 'install_from_source': False,
'install_from_ppa': False, 'install_from_ppa': False,
'ppa_version': 'stable',
'package': { 'package': {
'opts': {}, 'opts': {},
}, },