Browse Source

Moved entirely to ubuntu's ppa

tags/v0.55.0
Juan Manuel 9 years ago
parent
commit
a303c8cc0c
2 changed files with 2 additions and 12 deletions
  1. +1
    -11
      nginx/ng/install.sls
  2. +1
    -1
      pillar.example

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

{%- else %} {%- else %}
- absent - absent
{%- endif %} {%- endif %}
- humanname: nginx-ppa-{{ grains['oscodename'] }}
{%- if nginx.ppa_version == 'mainline' %}
- 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/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com
{%- endif %}
- file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }}
- ppa: nginx/{{ nginx.ppa_version }}
- require_in: - require_in:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in:

+ 1
- 1
pillar.example View File

ng: ng:
# PPA installing # PPA installing
install_from_ppa: True install_from_ppa: True
# Set to 'mainline' for edge nginx builds, 'development' for ubuntu's dev - beware, mainline has no 'full' build
# Set to 'stable', 'development' (mainline), 'community', or 'nightly' for each build accordingly ( https://launchpad.net/~nginx )
ppa_version: 'stable' ppa_version: 'stable'
# These are usually set by grains in map.jinja # These are usually set by grains in map.jinja

Loading…
Cancel
Save