Fix empty credentials.
This commit is contained in:
parent
5aee2a5cc2
commit
56b1faab41
1 changed files with 6 additions and 7 deletions
|
|
@ -13,8 +13,8 @@ services:
|
||||||
- "8883:8883"
|
- "8883:8883"
|
||||||
environment:
|
environment:
|
||||||
- SERVICE_FQDN_MOSQUITTO
|
- SERVICE_FQDN_MOSQUITTO
|
||||||
- MQTT_USERNAME=${MQTT_USERNAME:-mosquitto}
|
- MQTT_USERNAME=${MQTT_USERNAME}
|
||||||
- MQTT_PASSWORD=${MQTT_PASSWORD:-mosquitto}
|
- MQTT_PASSWORD=${MQTT_PASSWORD}
|
||||||
- REQUIRE_CERTIFICATE=${REQUIRE_CERTIFICATE:-false}
|
- REQUIRE_CERTIFICATE=${REQUIRE_CERTIFICATE:-false}
|
||||||
- ALLOW_ANONYMOUS=${ALLOW_ANONYMOUS:-true}
|
- ALLOW_ANONYMOUS=${ALLOW_ANONYMOUS:-true}
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -31,15 +31,14 @@ services:
|
||||||
fi &&
|
fi &&
|
||||||
echo ''require_certificate ''$REQUIRE_CERTIFICATE >> /mosquitto/config/mosquitto.conf &&
|
echo ''require_certificate ''$REQUIRE_CERTIFICATE >> /mosquitto/config/mosquitto.conf &&
|
||||||
echo ''allow_anonymous ''$ALLOW_ANONYMOUS >> /mosquitto/config/mosquitto.conf &&
|
echo ''allow_anonymous ''$ALLOW_ANONYMOUS >> /mosquitto/config/mosquitto.conf &&
|
||||||
|
if [ -n ''$MQTT_USERNAME''] && [ -n ''$MQTT_USERNAME'' ]; then
|
||||||
echo ''password_file /mosquitto/config/passwords'' >> /mosquitto/config/mosquitto.conf &&
|
echo ''password_file /mosquitto/config/passwords'' >> /mosquitto/config/mosquitto.conf &&
|
||||||
touch /mosquitto/config/passwords &&
|
touch /mosquitto/config/passwords &&
|
||||||
mosquitto_passwd -b -c /mosquitto/config/passwords $MQTT_USERNAME $MQTT_PASSWORD &&
|
|
||||||
chmod 0700 /mosquitto/config/passwords &&
|
chmod 0700 /mosquitto/config/passwords &&
|
||||||
chown root:root /mosquitto/config/passwords &&
|
chown root:root /mosquitto/config/passwords &&
|
||||||
chown mosquitto:mosquitto /mosquitto/config/passwords &&
|
mosquitto_passwd -b -c /mosquitto/config/passwords $MQTT_USERNAME $MQTT_PASSWORD &&
|
||||||
chmod 0700 /certs/ &&
|
chown mosquitto:mosquitto /mosquitto/config/passwords;
|
||||||
chown root:root /certs/ &&
|
fi &&
|
||||||
chown mosquitto:mosquitto /certs/ &&
|
|
||||||
exec mosquitto -c /mosquitto/config/mosquitto.conf
|
exec mosquitto -c /mosquitto/config/mosquitto.conf
|
||||||
"'
|
"'
|
||||||
labels:
|
labels:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue