Merge pull request #74 from TaiSHiNet/master

Minor bugfix and updated pillar.example

nginx/ng/install.sls

@@ -22,11 +22,16 @@ nginx_ppa_repo:
     - absent
     {%- endif %}
     - humanname: nginx-ppa-{{ grains['oscodename'] }}
+    {%- 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
-    - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
-    - dist: {{ grains['oscodename'] }}
     - 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:
       - pkg: nginx_install
     - watch_in:

pillar.example

@@ -21,6 +21,11 @@ nginx:
 
 nginx:
   ng:
+    # PPA installing
+    install_from_ppa: True
+    # Set to 'mainline' for edge nginx builds, 'development' for ubuntu's dev - beware, mainline has no 'full' build
+    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