Merge "Fix haproxy SSL configuration"

This commit is contained in:
Jenkins 2017-05-24 08:20:59 +00:00 committed by Gerrit Code Review
commit a594b936b6
2 changed files with 3 additions and 1 deletions

View File

@ -100,6 +100,7 @@ class plugin_zabbix::ha::haproxy {
listen_port => 443, listen_port => 443,
balancermember_port => 80, balancermember_port => 80,
public_ssl => true, public_ssl => true,
public_ssl_path => '/var/lib/astute/haproxy/public_haproxy.pem',
haproxy_config_options => { haproxy_config_options => {
'option' => ['forwardfor', 'httpchk', 'httpclose', 'httplog'], 'option' => ['forwardfor', 'httpchk', 'httpclose', 'httplog'],
'stick-table' => 'type ip size 200k expire 30m', 'stick-table' => 'type ip size 200k expire 30m',

View File

@ -182,7 +182,8 @@ class plugin_zabbix::params {
$zabbix_admin_password_md5 = md5($zabbix_hash['password']) $zabbix_admin_password_md5 = md5($zabbix_hash['password'])
#api #api
if $ssl[horizon] == true { $use_ssl = $ssl[horizon] or $ssl[services]
if $use_ssl {
$api_url = "https://${mgmt_vip}${frontend_base}/api_jsonrpc.php" $api_url = "https://${mgmt_vip}${frontend_base}/api_jsonrpc.php"
}else{ }else{
$api_url = "http://${mgmt_vip}${frontend_base}/api_jsonrpc.php" $api_url = "http://${mgmt_vip}${frontend_base}/api_jsonrpc.php"