From 8043ffef738e999b50b6472828cd6c30bb7c320c Mon Sep 17 00:00:00 2001 From: Ajna Cackovic Date: Mon, 20 Oct 2014 10:59:34 -0700 Subject: [PATCH 1/2] Allow selection of repo_version --- nginx/package.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/package.sls b/nginx/package.sls index a76d260..936a88f 100644 --- a/nginx/package.sls +++ b/nginx/package.sls @@ -50,8 +50,8 @@ nginx-ppa-repo: - absent {%- endif %} - humanname: nginx-ppa-{{ grains['oscodename'] }} - - name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main - - file: /etc/apt/sources.list.d/nginx-stable-{{ grains['oscodename'] }}.list + - 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-{{ pillar.get('nginx', {}).get('repo_version', 'stable') }}-{{ grains['oscodename'] }}.list - dist: {{ grains['oscodename'] }} - keyid: C300EE8C - keyserver: keyserver.ubuntu.com From 29b3aa64621a3e3e2075dc4d0ccb1bde87b82ac5 Mon Sep 17 00:00:00 2001 From: Ajna Cackovic Date: Mon, 20 Oct 2014 14:17:27 -0700 Subject: [PATCH 2/2] Update pillar.example --- pillar.example | 1 + 1 file changed, 1 insertion(+) diff --git a/pillar.example b/pillar.example index 68dc255..f8dcb8e 100644 --- a/pillar.example +++ b/pillar.example @@ -5,6 +5,7 @@ nginx: user_auth_enabled: True with_luajit: False 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 from_ips: - 10.10.10.0/24