Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions haproxy/haproxycfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Haproxy(object):
cls_cfg = None
cls_process = None
cls_certs = []
cls_ca_certs = []

def __init__(self, link_mode="", msg=""):
logger.info("==========BEGIN==========")
Expand Down Expand Up @@ -167,8 +168,8 @@ def _config_ssl_cacerts(self):
if DEFAULT_CA_CERT:
cacerts.append(DEFAULT_CA_CERT)
if cacerts:
if set(cacerts) != set(Haproxy.cls_certs):
Haproxy.cls_certs = copy.copy(cacerts)
if set(cacerts) != set(Haproxy.cls_ca_certs):
Haproxy.cls_ca_certs = copy.copy(cacerts)
self.ssl_updated = True
SslHelper.save_certs(CACERT_DIR, cacerts)
logger.info("SSL CA certificates are updated")
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_haproxycfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def test_config_ssl_certs(self, mock_init, mock_save):
haproxycfg.DEFAULT_CA_CERT = "cacert"
Haproxy.cls_certs = []
self.assertEqual(" ca-file /cacerts/cert0.pem verify required", haproxy._config_ssl_cacerts())
self.assertEqual(["cacert"], Haproxy.cls_certs)
self.assertEqual(["cacert"], Haproxy.cls_ca_certs)
self.assertTrue(haproxy.ssl_updated)

haproxy = Haproxy()
Expand Down