Browse Source

Added support to control gpgcheck and gpgkey via pillar

susefix
Enver 8 years ago
parent
commit
46785b79aa
3 changed files with 10 additions and 3 deletions
  1. +4
    -3
      nginx/ng/install.sls
  2. +4
    -0
      nginx/ng/map.jinja
  3. +2
    -0
      pillar.example

+ 4
- 3
nginx/ng/install.sls View File

- baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/' - baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/'
- enabled: True - enabled: True
- autorefresh: 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: - require_in:
- pkg: nginx_install - pkg: nginx_install
- watch_in: - watch_in:
{%- else %} {%- else %}
- baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/' - baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
{%- endif %} {%- endif %}
- gpgcheck: False
- gpgcheck: {{ nginx.lookup.gpg_check }}
- gpgkey: {{ nginx.lookup.gpg_key }}
- enabled: True - enabled: True
- require_in: - require_in:
- pkg: nginx_install - pkg: nginx_install

+ 4
- 0
nginx/ng/map.jinja View File

'vhost_use_symlink': False, 'vhost_use_symlink': False,
'pid_file': '/run/nginx.pid', 'pid_file': '/run/nginx.pid',
'rh_os_releasever': '$releasever', 'rh_os_releasever': '$releasever',
'gpg_check': False,
'gpg_key': 'http://nginx.org/keys/nginx_signing.key',
}, },
'Suse': { 'Suse': {
'package': 'nginx', 'package': 'nginx',
'vhost_enabled': '/etc/nginx/conf.d', 'vhost_enabled': '/etc/nginx/conf.d',
'vhost_use_symlink': False, 'vhost_use_symlink': False,
'pid_file': '/run/nginx.pid', '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': { 'Arch': {
'package': 'nginx', 'package': 'nginx',

+ 2
- 0
pillar.example View File

vhost_use_symlink: True vhost_use_symlink: True
# This is required for RedHat like distros (Amazon Linux) that don't follow semantic versioning for $releasever # This is required for RedHat like distros (Amazon Linux) that don't follow semantic versioning for $releasever
rh_os_releasever: '6' 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 # Source compilation is not currently a part of nginx.ng
from_source: False from_source: False

Loading…
Cancel
Save