Merge remote-tracking branch 'upstream/master' into zope4py2

component/fluentbit-plugin-wendelin/obs.cfg

@@ -17,6 +17,10 @@ extends =
 parts =
   fluentbit-plugin-wendelin
 
+[fluentbit-plugin-wendelin]
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/0.3.1/fluentbit-plugin-wendelin-0.3.1.tar.gz
+md5sum = 7bafdcbeb2bf9634e041fde95b63b51f
+
 [golang1.17]
 # Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
 # A less radical way to fix the issue may be investigated in the future.

software/mosquitto/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 4c7aa7b2132dc13ddee37fb416decf81
+md5sum = a6061e8bea111d96c10223f9b201ecc0

software/mosquitto/instance.cfg.in

@@ -84,7 +84,10 @@ output = $${:wrapper-path}
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish
-ipv4 = mqtt://${mosquitto-config-file:ipv4}:${mosquitto-config-file:port}
-ipv6 = mqtt://${mosquitto-config-file:ipv6}:${mosquitto-config-file:port}
+ipv4 = ${mosquitto-config-file:ipv4}
+ipv6 = ${mosquitto-config-file:ipv6}
+port = ${mosquitto-config-file:port}
+ipv4-url = mqtt://${mosquitto-config-file:ipv4}:${mosquitto-config-file:port}
+ipv6-url = mqtt://${mosquitto-config-file:ipv6}:${mosquitto-config-file:port}
 username = ${mosquitto-password:username}
 password = ${mosquitto-password:passwd}