Browse Source

Choose mainline/stable from ppa at will

susefix
Juan Manuel 9 years ago
parent
commit
afc723802d
2 changed files with 3 additions and 2 deletions
  1. +2
    -2
      nginx/ng/install.sls
  2. +1
    -0
      nginx/ng/map.jinja

+ 2
- 2
nginx/ng/install.sls View File

@@ -22,8 +22,8 @@ nginx_ppa_repo:
- absent
{%- endif %}
- 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'] }}
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com

+ 1
- 0
nginx/ng/map.jinja View File

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

Loading…
Cancel
Save