Handle installation of openssl to generate DH param
This commit is contained in:
parent
19ab90ebb5
commit
db2db31300
@ -1,3 +1,5 @@
|
|||||||
|
{% from 'nginx/ng/map.jinja' import nginx with context %}
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- nginx.ng.service
|
- nginx.ng.service
|
||||||
|
|
||||||
@ -11,6 +13,8 @@ create_nginx_dhparam_key:
|
|||||||
- 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
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
'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',
|
||||||
@ -30,6 +31,7 @@
|
|||||||
'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',
|
||||||
@ -49,6 +51,7 @@
|
|||||||
'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',
|
||||||
@ -60,7 +63,8 @@
|
|||||||
'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',
|
||||||
@ -70,6 +74,7 @@
|
|||||||
'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',
|
||||||
@ -79,6 +84,7 @@
|
|||||||
'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…
Reference in New Issue
Block a user