Skip to content

Commit 417ec22

Browse files
committed
Fixes prior omissions
`docker-entrypoint.sh` was out-of-sync with master and old-menu versions. `iotstack_defaults` directory missing.
1 parent a5cfebe commit 417ec22

File tree

4 files changed

+44
-2
lines changed

4 files changed

+44
-2
lines changed

.internal/templates/services/mosquitto/buildFiles/docker-entrypoint.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ set -e
44
# Set permissions
55
user="$(id -u)"
66
if [ "$user" = '0' -a -d "/mosquitto" ]; then
7-
rsync -arp --ignore-existing /${MOSQUITTO_IOTSTACK_DEFAULTS}/ "/mosquitto"
8-
chown -R mosquitto:mosquitto /mosquitto
7+
8+
rsync -arp --ignore-existing /${IOTSTACK_DEFAULTS_DIR}/ "/mosquitto"
9+
10+
chown -R mosquitto:mosquitto /mosquitto
11+
912
fi
1013

1114
exec "$@"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
user admin
2+
topic read #
3+
topic write #
4+
5+
pattern read #
6+
pattern write #
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# required by https://mosquitto.org/documentation/migrating-to-2-0/
2+
#
3+
listener 1883
4+
5+
# persistence enabled for remembering retain flag across restarts
6+
#
7+
persistence true
8+
persistence_location /mosquitto/data
9+
10+
# logging options:
11+
# enable one of the following (stdout = less wear on SD cards but
12+
# logs do not persist across restarts)
13+
#log_dest file /mosquitto/log/mosquitto.log
14+
log_dest stdout
15+
log_timestamp_format %Y-%m-%dT%H:%M:%S
16+
17+
# password handling:
18+
# password_file commented-out allow_anonymous true =
19+
# open access
20+
# password_file commented-out allow_anonymous false =
21+
# no access
22+
# password_file activated allow_anonymous true =
23+
# passwords omitted is permitted but
24+
# passwords provided must match pwfile
25+
# password_file activated allow_anonymous false =
26+
# no access without passwords
27+
# passwords provided must match pwfile
28+
#
29+
#password_file /mosquitto/pwfile/pwfile
30+
allow_anonymous true
31+
32+
# Uncomment to enable filters
33+
#acl_file /mosquitto/config/filter.acl

.internal/templates/services/mosquitto/buildFiles/iotstack_defaults/pwfile/pwfile

Whitespace-only changes.

0 commit comments

Comments
 (0)