Browse Source

Handle installation of openssl to generate DH param

tags/v0.55.0
Gilles Dartiguelongue 7 years ago
parent
commit
db2db31300
2 changed files with 11 additions and 1 deletions
  1. +4
    -0
      nginx/ng/certificates.sls
  2. +7
    -1
      nginx/ng/map.jinja

+ 4
- 0
nginx/ng/certificates.sls View File

{% from 'nginx/ng/map.jinja' import nginx with context %}

include: include:
- nginx.ng.service - nginx.ng.service


- makedirs: True - makedirs: True
{% elif salt.pillar.get('nginx:ng:dh_keygen', False) %} {% elif salt.pillar.get('nginx:ng:dh_keygen', False) %}
generate_nginx_dhparam_key: generate_nginx_dhparam_key:
pkg.installed:
- name: {{ nginx.lookup.openssl_package }}
file.directory: file.directory:
- name: {{ certificates_path }} - name: {{ certificates_path }}
- makedirs: True - makedirs: True

+ 7
- 1
nginx/ng/map.jinja View File

'server_enabled': '/etc/nginx/sites-enabled', 'server_enabled': '/etc/nginx/sites-enabled',
'server_use_symlink': True, 'server_use_symlink': True,
'pid_file': '/run/nginx.pid', 'pid_file': '/run/nginx.pid',
'openssl_package': 'openssl',
}, },
'CentOS': { 'CentOS': {
'package': 'nginx', 'package': 'nginx',
'rh_os_releasever': '$releasever', 'rh_os_releasever': '$releasever',
'gpg_check': False, 'gpg_check': False,
'gpg_key': 'http://nginx.org/keys/nginx_signing.key', 'gpg_key': 'http://nginx.org/keys/nginx_signing.key',
'openssl_package': 'openssl',
}, },
'RedHat': { 'RedHat': {
'package': 'nginx', 'package': 'nginx',
'passenger_instance_registry_dir': ' /var/run/passenger-instreg', 'passenger_instance_registry_dir': ' /var/run/passenger-instreg',
'passenger_ruby': '/usr/bin/ruby', 'passenger_ruby': '/usr/bin/ruby',
}, },
'openssl_package': 'openssl',
}, },
'Suse': { 'Suse': {
'package': 'nginx', 'package': 'nginx',
'server_use_symlink': False, 'server_use_symlink': False,
'pid_file': '/run/nginx.pid', 'pid_file': '/run/nginx.pid',
'gpg_check': True, 'gpg_check': True,
'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key'
'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/repodata/repomd.xml.key',
'openssl_package': 'openssl',
}, },
'Arch': { 'Arch': {
'package': 'nginx', 'package': 'nginx',
'server_available': '/etc/nginx/sites-available', 'server_available': '/etc/nginx/sites-available',
'server_enabled': '/etc/nginx/sites-enabled', 'server_enabled': '/etc/nginx/sites-enabled',
'server_use_symlink': True, 'server_use_symlink': True,
'openssl_package': 'openssl',
}, },
'Gentoo': { 'Gentoo': {
'package': 'www-servers/nginx', 'package': 'www-servers/nginx',
'server_available': '/etc/nginx/sites-available', 'server_available': '/etc/nginx/sites-available',
'server_enabled': '/etc/nginx/sites-enabled', 'server_enabled': '/etc/nginx/sites-enabled',
'server_use_symlink': True, 'server_use_symlink': True,
'openssl_package': 'dev-libs/openssl',
}, },
}, default='Debian' ), }, default='Debian' ),
'install_from_source': False, 'install_from_source': False,

Loading…
Cancel
Save