From 9de2a2631cec0693d87bd3d715f13de85eb104ee Mon Sep 17 00:00:00 2001
From: Juan Manuel <taishi@taishi-network.net>
Date: Tue, 10 Feb 2015 17:20:52 -0300
Subject: [PATCH] Added nginx repo key for mainline

---
 nginx/ng/install.sls | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index 9668ac7..54fceb9 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -24,13 +24,14 @@ nginx_ppa_repo:
     - 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/stable/ubuntu {{ grains['oscodename'] }} main
+    - keyid: C300EE8C
+    - keyserver: keyserver.ubuntu.com
     {%- endif %}
     - file: /etc/apt/sources.list.d/nginx-{{ nginx.ppa_version }}-{{ grains['oscodename'] }}.list
     - dist: {{ grains['oscodename'] }}
-    - keyid: C300EE8C
-    - keyserver: keyserver.ubuntu.com
     - require_in:
       - pkg: nginx_install
     - watch_in: