diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls index 54fceb9..814a330 100644 --- a/nginx/ng/install.sls +++ b/nginx/ng/install.sls @@ -26,7 +26,7 @@ nginx_ppa_repo: - 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/stable/ubuntu {{ grains['oscodename'] }} main + - name: deb http://ppa.launchpad.net/nginx/{{ nginx.ppa_version }}/ubuntu {{ grains['oscodename'] }} main - keyid: C300EE8C - keyserver: keyserver.ubuntu.com {%- endif %} diff --git a/pillar.example b/pillar.example index 162dd7c..dc8a687 100644 --- a/pillar.example +++ b/pillar.example @@ -23,7 +23,7 @@ nginx: ng: # PPA installing install_from_ppa: True - # Set to 'mainline' for edge nginx builds + # 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