Browse Source

Minor bugfix and updated pillar.example

tags/v0.55.0
Juan Manuel 10 years ago
parent
commit
88dfd0835c
2 changed files with 10 additions and 2 deletions
  1. +5
    -1
      nginx/ng/install.sls
  2. +5
    -1
      pillar.example

+ 5
- 1
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/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main
{%- if nginx.ppa_version == 'mainline' %}
- name: deb http://nginx.org/packages/mainline/ubuntu/ {{ grains['oscodename'] }} nginx
{%- else %}
- name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main
{%- endif %}
- file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }} - dist: {{ grains['oscodename'] }}
- keyid: C300EE8C - keyid: C300EE8C

+ 5
- 1
pillar.example View File



nginx: nginx:
ng: ng:
# PPA installing
install_from_ppa: True
# Set to 'mainline' for edge nginx builds
ppa_version: 'stable'
# These are usually set by grains in map.jinja # These are usually set by grains in map.jinja
lookup: lookup:
package: nginx-custom package: nginx-custom
vhost_available: /etc/nginx/sites-available vhost_available: /etc/nginx/sites-available
vhost_enabled: /etc/nginx/sites-enabled vhost_enabled: /etc/nginx/sites-enabled
vhost_use_symlink: True vhost_use_symlink: True
repo_source: official


# Source compilation is not currently a part of nginx.ng # Source compilation is not currently a part of nginx.ng
from_source: False from_source: False

Loading…
Cancel
Save