From 88dfd0835c63e4a4ac307f85be415480ba0aa653 Mon Sep 17 00:00:00 2001
From: Juan Manuel <taishi@taishi-network.net>
Date: Tue, 10 Feb 2015 17:14:00 -0300
Subject: [PATCH] Minor bugfix and updated pillar.example

---
 nginx/ng/install.sls | 6 +++++-
 pillar.example       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index a401f67..9668ac7 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -22,7 +22,11 @@ nginx_ppa_repo:
     - absent
     {%- endif %}
     - 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
     - dist: {{ grains['oscodename'] }}
     - keyid: C300EE8C
diff --git a/pillar.example b/pillar.example
index f8dcb8e..162dd7c 100644
--- a/pillar.example
+++ b/pillar.example
@@ -21,6 +21,11 @@ nginx:
 
 nginx:
   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
     lookup:
       package: nginx-custom
@@ -30,7 +35,6 @@ nginx:
       vhost_available: /etc/nginx/sites-available
       vhost_enabled: /etc/nginx/sites-enabled
       vhost_use_symlink: True
-      repo_source: official
 
     # Source compilation is not currently a part of nginx.ng
     from_source: False