PR#4281: Removed variables from default config as properly defined elsewhere for mqtt - pagure

pagure

#4281 Removed variables from default config as properly defined elsewhere for mqtt

Merged 5 years ago by pingou. Opened 5 years ago by arrfab.

arrfab/pagure mqtt-variables-fix into master

Removed variables from default config as properly defined elsewhere for mqtt

Fabian Arrotin • 5 years ago

9484047

pagure/default_config.py

file modified

-2

		`@@ -422,8 +422,6 @@`
		`MQTT_CA_CERTS = None`
		`MQTT_CERTFILE = None`
		`MQTT_KEYFILE = None`
		`- MQTT_CERT_REQS = None`
		`- MQTT_TLS_VERSION = None`
		`MQTT_CIPHERS = None`

		`# Settings for Stomp message sending`

arrfab commented 5 years ago

We don't want those variables to be in default config, as lib/notify.py will initialize those correctly with python ssl lib if nothing is specified in pagure.cfg :

mqtt_cert_reqs = pagure_config.get("MQTT_CERT_REQS", ssl.CERT_REQUIRED)
mqtt_tls_version = pagure_config.get( "MQTT_TLS_VERSION", ssl.PROTOCOL_TLSv1_2)

Having those two variables in default config set to None breaks mqtt notification (as they don't get correct default values from ssl)

Signed-off-by: Fabian Arrotin fabian.arrotin@arrfab.net