浏览代码

Added option to use 'development' ppa

tags/v0.55.0
Juan Manuel 10 年前
父节点
当前提交
c91377897a
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      nginx/ng/install.sls
  2. +1
    -1
      pillar.example

+ 1
- 1
nginx/ng/install.sls 查看文件

@@ -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 查看文件

@@ -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

正在加载...
取消
保存