diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp index 18caf2c..e61b457 100644 --- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp +++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp @@ -100,6 +100,7 @@ class plugin_zabbix::ha::haproxy { listen_port => 443, balancermember_port => 80, public_ssl => true, + public_ssl_path => '/var/lib/astute/haproxy/public_haproxy.pem', haproxy_config_options => { 'option' => ['forwardfor', 'httpchk', 'httpclose', 'httplog'], 'stick-table' => 'type ip size 200k expire 30m', diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp index 3768d34..7876061 100644 --- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp +++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp @@ -182,7 +182,8 @@ class plugin_zabbix::params { $zabbix_admin_password_md5 = md5($zabbix_hash['password']) #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" }else{ $api_url = "http://${mgmt_vip}${frontend_base}/api_jsonrpc.php"