Changed mqtt properties back to MQTT_*

mouse256 · Mar 28, 2024 · 40b6bb3 · 40b6bb3
1 parent 2cecb7f
commit 40b6bb3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -24,13 +24,14 @@ docker run \
 ```
 The following environment variables are supported:
 
-| Variable                                      | Description                    |
-|-----------------------------------------------|--------------------------------|
-| MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_HOST     | IP address of the MQTT server  |
-| MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_HOST     | Port of the MQTT server        |
-| MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_USERNAME | MQTT username (optional)       |
-| MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_PASSWORD | MQTT password (optional)       |
-| ARYLIC_DEVICES_0__IP                          | IP address of an Arylic device |
+| Variable             | Description                                                                                                                                                                                      |
+|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| MQTT_HOST            | IP address of the MQTT server                                                                                                                                                                    |
+| MQTT_HOST            | Port of the MQTT server                                                                                                                                                                          |
+| MQTT_USERNAME        | MQTT username (optional)                                                                                                                                                                         |
+| MQTT_PASSWORD        | MQTT password (optional)                                                                                                                                                                         |
+| MQTT_SSL_...         | MQTT SSL options. See [smallrye mqtt configuration page](https://smallrye.io/smallrye-reactive-messaging/smallrye-reactive-messaging/3.4/mqtt/mqtt.html#_configuration_reference)  for options   |
+| ARYLIC_DEVICES_0__IP | IP address of an Arylic device                                                                                                                                                                   |
 
 The ARYLIC_DEVICES variable can be repeated multiple times with a different index for multiple devices
 

diff --git a/runInDocker.sh b/runInDocker.sh
@@ -3,7 +3,7 @@
 ./gradlew assemble && \
 	docker build -f src/main/docker/Dockerfile.jvm -t quarkus/arylic-mqtt-jvm . && \
 	docker run -i --rm \
-	-e MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_HOST=192.168.1.152 \
-	-e MP_MESSAGING_CONNECTOR_SMALLRYE_MQTT_PORT=1883 \
+	-e MQTT_HOST=192.168.1.152 \
+	-e MQTT_PORT=1883 \
 	-e arylic_devices_0__ip=192.168.1.73 \
 	-p 8080:8080 quarkus/arylic-mqtt-jvm
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -8,10 +8,24 @@ arylic.discovery-timer=PT30s
 #Interal at which to write an empty message to detect broken sockets
 arylic.ping-timer=PT5m
 
-mp.messaging.connector.smallrye-mqtt.host=127.0.0.1
-mp.messaging.connector.smallrye-mqtt.port=1883
-%dev.mp.messaging.connector.smallrye-mqtt.client-id=arylic-mqtt-dev
-mp.messaging.connector.smallrye-mqtt.client-id=arylic-mqtt2
+
+mqtt.host=127.0.0.1
+mqtt.port=1883
+mqtt.client-id=arylic-mqtt
+%dev.mqtt.client-id=arylic-mqtt-dev
+
+mp.messaging.connector.smallrye-mqtt.host=${mqtt.host}
+mp.messaging.connector.smallrye-mqtt.port=${mqtt.port}
+mp.messaging.connector.smallrye-mqtt.client-id=${mqtt.client-id}
+mp.messaging.connector.smallrye-mqtt.username=${mqtt.username:}
+mp.messaging.connector.smallrye-mqtt.password=${mqtt.password:}
+mp.messaging.connector.smallrye-mqtt.ssl=${mqtt.ssl:false}
+mp.messaging.connector.smallrye-mqtt.ssl.keystore.type=${mqtt.ssl.keystore.type:pkcs12}
+mp.messaging.connector.smallrye-mqtt.ssl.keystore.location=${mqtt.ssl.keystore.location:}
+mp.messaging.connector.smallrye-mqtt.ssl.keystore.password=${mqtt.ssl.keystore.password:}
+mp.messaging.connector.smallrye-mqtt.ssl.truststore.type=${mqtt.ssl.truststore.type:pkcs12}
+mp.messaging.connector.smallrye-mqtt.ssl.truststore.location=${mqtt.ssl.truststore.location:}
+mp.messaging.connector.smallrye-mqtt.ssl.truststore.password=${mqtt.ssl.truststore.password:}
 
 # Inbound
 mp.messaging.incoming.cmd.type=smallrye-mqtt