Browse Source

Added option to use 'development' ppa

susefix
Juan Manuel 10 years ago
parent
commit
c91377897a
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      nginx/ng/install.sls
  2. +1
    -1
      pillar.example

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

@@ -26,7 +26,7 @@ nginx_ppa_repo:
- name: deb http://nginx.org/packages/mainline/ubuntu/ {{ grains['oscodename'] }} nginx
- key_url: http://nginx.org/keys/nginx_signing.key
{%- 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
- keyserver: keyserver.ubuntu.com
{%- endif %}

+ 1
- 1
pillar.example View File

@@ -23,7 +23,7 @@ nginx:
ng:
# PPA installing
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'
# These are usually set by grains in map.jinja

Loading…
Cancel
Save