From afc723802dc40abd80cc7ade57a7e45953e8fa8a Mon Sep 17 00:00:00 2001
From: Juan Manuel <taishi@taishi-network.net>
Date: Tue, 10 Feb 2015 16:59:49 -0300
Subject: [PATCH] Choose mainline/stable from ppa at will

---
 nginx/ng/install.sls | 4 ++--
 nginx/ng/map.jinja   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index 45fc003..a401f67 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -22,8 +22,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/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main
+    - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
     - dist: {{ grains['oscodename'] }}
     - keyid: C300EE8C
     - keyserver: keyserver.ubuntu.com
diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index 08f62f3..8efb954 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -27,6 +27,7 @@
     }, default='Debian' ),
     'install_from_source': False,
     'install_from_ppa': False,
+    'ppa_version': 'stable',
     'package': {
         'opts': {},
     },