Browse Source
Merge pull request #73 from TaiSHiNet/master
Choose mainline/stable from ppa at willsusefix
Nitin Madhok
10 years ago
2 changed files with 3 additions and 2 deletions
+ 2
- 2
nginx/ng/install.sls
View File
| - 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 | |||||
| - file: /etc/apt/sources.list.d/nginx-stable-{{ grains['oscodename'] }}.list | |||||
| - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main | |||||
| - 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
- 0
nginx/ng/map.jinja
View File
| }, 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': {}, | ||||
| }, | }, |
Loading…