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

Merge pull request #58 from OneID/feature/repo-version

Browse Source 
Allow ppa install using development/mainline etc
This commit is contained in:
Nitin Madhok 2014-10-20 17:23:49 -04:00
commit 262070ab06
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/package.sls
View File

@ -61,8 +61,8 @@ nginx-ppa-repo:
- absent - absent
{%- endif %} {%- endif %}
- humanname: nginx-ppa-{{ grains['oscodename'] }} - humanname: nginx-ppa-{{ grains['oscodename'] }}
- name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main - name: deb http://ppa.launchpad.net/nginx/{{ pillar.get('nginx', {}).get('repo_version', 'stable') }}/ubuntu {{ grains['oscodename'] }} main
- file: /etc/apt/sources.list.d/nginx-stable-{{ grains['oscodename'] }}.list - file: /etc/apt/sources.list.d/nginx-{{ pillar.get('nginx', {}).get('repo_version', 'stable') }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }} - dist: {{ grains['oscodename'] }}
- keyid: C300EE8C - keyid: C300EE8C
- keyserver: keyserver.ubuntu.com - keyserver: keyserver.ubuntu.com

1
pillar.example
View File

@ -5,6 +5,7 @@ nginx:
user_auth_enabled: True user_auth_enabled: True
with_luajit: False with_luajit: False
with_openresty: True with_openresty: True
repo_version: development # Must be using ppa install by setting `repo_source = ppa`
set_real_ips: # NOTE: to use this, nginx must have http_realip module enabled set_real_ips: # NOTE: to use this, nginx must have http_realip module enabled
from_ips: from_ips:
- 10.10.10.0/24 - 10.10.10.0/24