saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved entirely to ubuntu's ppa

Browse Source
This commit is contained in:
Juan Manuel 2015-02-23 18:16:41 -03:00
parent eed147836d
commit a303c8cc0c
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nginx/ng/install.sls
View File

@ -21,17 +21,7 @@ nginx_ppa_repo:
{%- else %} {%- else %}
- absent - absent
{%- endif %} {%- endif %}
- humanname: nginx-ppa-{{ grains['oscodename'] }} - ppa: nginx/{{ nginx.ppa_version }}
{%- 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'] }}
- require_in: - require_in:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in:

2
pillar.example
View File

@ -23,7 +23,7 @@ nginx:
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