Browse Source

Fix haproxy SSL configuration

Closes-Bug: #1691160

Change-Id: If7ef7281cd0ca4bff357948401115fc9d32af54a
Olivier Bourdon 1 year ago
parent
commit
9d4cb0e001

+ 1
- 0
deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp View File

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

+ 2
- 1
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp View File

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

Loading…
Cancel
Save