From 46785b79aa0b08a170de1997df12e0bd17289382 Mon Sep 17 00:00:00 2001
From: Enver <enver@personal.com>
Date: Wed, 24 Feb 2016 11:11:42 +0100
Subject: [PATCH] Added support to control gpgcheck and gpgkey via pillar

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

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index c2d1ae3..6fd8843 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -41,8 +41,8 @@ nginx_zypp_repo:
     - baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/'
     - enabled: True
     - autorefresh: True
-    - gpgcheck: True
-    - gpgkey: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key'
+    - gpgcheck: {{ nginx.lookup.gpg_check }}
+    - gpgkey: {{ nginx.lookup.gpg_key }}
     - require_in:
       - pkg: nginx_install
     - watch_in:
@@ -63,7 +63,8 @@ nginx_yum_repo:
     {%- else %}
     - baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
     {%- endif %}
-    - gpgcheck: False
+    - gpgcheck: {{ nginx.lookup.gpg_check }}
+    - gpgkey: {{ nginx.lookup.gpg_key }}
     - enabled: True
     - require_in:
       - pkg: nginx_install
diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index c97ab48..1521097 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -26,6 +26,8 @@
             'vhost_use_symlink': False,
             'pid_file': '/run/nginx.pid',
             'rh_os_releasever': '$releasever',
+            'gpg_check': False,
+            'gpg_key': 'http://nginx.org/keys/nginx_signing.key',
         },
         'Suse': {
             'package': 'nginx',
@@ -36,6 +38,8 @@
             'vhost_enabled': '/etc/nginx/conf.d',
             'vhost_use_symlink': False,
             'pid_file': '/run/nginx.pid',
+            'gpg_check': True,
+            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key'
         },
         'Arch': {
             'package': 'nginx',
diff --git a/pillar.example b/pillar.example
index 45fbf6e..54450ca 100644
--- a/pillar.example
+++ b/pillar.example
@@ -37,6 +37,8 @@ nginx:
       vhost_use_symlink: True
       # This is required for RedHat like distros (Amazon Linux) that don't follow semantic versioning for $releasever
       rh_os_releasever: '6'
+      # Currently it can be used on rhel/centos/suse when installing from repo
+      gpg_check: True
 
     # Source compilation is not currently a part of nginx.ng
     from_source: False