Skip to content

Commit 10f7376

Browse files
author
Slyke
committed
Merge branch 'master' into pr/132
2 parents 85da301 + 7a1fba9 commit 10f7376

30 files changed

+1183
-102
lines changed

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
/services/
33
/volumes/
44
/backups/
5+
/.tmp/*
6+
__pycache__
57
docker-compose.yml
6-
.outofdate
8+
compose-override.yml
9+
.outofdate
10+
11+
!.gitkeep

‎.templates/deconz/build.sh

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
3+
#deCONZ device configuration
4+
5+
DOCKER_COMPOSE_PATH=./.tmp/docker-compose.tmp.yml
6+
7+
if [[ ! -f $DOCKER_COMPOSE_PATH ]]; then
8+
echo "[deCONZ] Warning: $DOCKER_COMPOSE_PATH does not exist."
9+
fi
10+
11+
device_selection=$(whiptail --radiolist --title "Select deCONZ gateway" --notags \
12+
"Use the [SPACEBAR] to select your deCONZ gateway from the list below AND MAKE SURE IT IS PLUGGED IN (if not, press [ESC])." 20 78 12 \
13+
"ConBeeII" "ConBee II " "ON" \
14+
"ConBee" "ConBee " "OFF" \
15+
"RaspBee" "RaspBee " "OFF" \
16+
3>&1 1>&2 2>&3)
17+
18+
case $device_selection in
19+
20+
"ConBeeII")
21+
if [[ ! -f ./.templates/deconz/service_conbee_II.yml ]]; then
22+
echo "Error: ./.templates/deconz/service_conbee_II.yml does not exist."
23+
else
24+
cat ./.templates/deconz/service_conbee_II.yml >> $DOCKER_COMPOSE_PATH
25+
echo "...copied ConBee II config from template"
26+
fi
27+
;;
28+
"ConBee")
29+
if [[ ! -f ./.templates/deconz/service_conbee.yml ]]; then
30+
echo "Error: ./.templates/deconz/service_conbee.yml does not exist."
31+
else
32+
cat ./.templates/deconz/service_conbee.yml >> $DOCKER_COMPOSE_PATH
33+
echo "...copied ConBee config from template"
34+
fi
35+
;;
36+
"RaspBee")
37+
if [[ ! -f ./.templates/deconz/service_raspbee.yml ]]; then
38+
echo "Error: ./.templates/deconz/service_raspbee.yml does not exist."
39+
else
40+
cat ./.templates/deconz/service_raspbee.yml >> $DOCKER_COMPOSE_PATH
41+
echo "...copied RaspBee config from template"
42+
fi
43+
;;
44+
esac

‎.templates/deconz/service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎.templates/deconz/service_conbee.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
deconz:
2+
image: marthoc/deconz
3+
container_name: deconz
4+
restart: unless-stopped
5+
ports:
6+
- '8090:80'
7+
- '443:443'
8+
- '5901:5900'
9+
volumes:
10+
- ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
11+
devices:
12+
#ConBee:
13+
- /dev/ttyUSB0
14+
environment:
15+
- DECONZ_VNC_MODE=1
16+
- DECONZ_VNC_PASSWORD=changeme
17+
- DEBUG_INFO=1
18+
- DEBUG_APS=0
19+
- DEBUG_ZCL=0
20+
- DEBUG_ZDP=0
21+
- DEBUG_OTAU=0

‎.templates/deconz/service_conbee_II.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
deconz:
2+
image: marthoc/deconz
3+
container_name: deconz
4+
restart: unless-stopped
5+
ports:
6+
- '8090:80'
7+
- '443:443'
8+
- '5901:5900'
9+
volumes:
10+
- ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
11+
devices:
12+
#ConBee II:
13+
- /dev/ttyACM0
14+
environment:
15+
- DECONZ_VNC_MODE=1
16+
- DECONZ_VNC_PASSWORD=changeme
17+
- DEBUG_INFO=1
18+
- DEBUG_APS=0
19+
- DEBUG_ZCL=0
20+
- DEBUG_ZDP=0
21+
- DEBUG_OTAU=0

‎.templates/deconz/service_raspbee.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
deconz:
2+
image: marthoc/deconz
3+
container_name: deconz
4+
restart: unless-stopped
5+
ports:
6+
- '8090:80'
7+
- '443:443'
8+
- '5901:5900'
9+
volumes:
10+
- ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
11+
devices:
12+
#RaspBee:
13+
- /dev/ttyAMA0
14+
#alternatively - /dev/ttyS0
15+
environment:
16+
- DECONZ_VNC_MODE=1
17+
- DECONZ_VNC_PASSWORD=changeme
18+
- DEBUG_INFO=1
19+
- DEBUG_APS=0
20+
- DEBUG_ZCL=0
21+
- DEBUG_ZDP=0
22+
- DEBUG_OTAU=0

‎.templates/dozzle/service.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dozzle:
2+
container_name: dozzle
3+
image: amir20/dozzle:latest
4+
restart: unless-stopped
5+
network_mode: host
6+
ports:
7+
- 8888:8080
8+
volumes:
9+
- /var/run/docker.sock:/var/run/docker.sock

‎.templates/grafana/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
grafana:
22
container_name: grafana
3-
image: grafana/grafana:6.3.6
3+
image: grafana/grafana
44
restart: unless-stopped
55
user: "0"
66
ports:

‎.templates/mosquitto/directoryfix.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if [ $(grep -c 'user: \"1883\"' ./services/mosquitto/service.yml) -eq 1 ]; then
77
echo "...found user 1883"
88
sudo mkdir -p ./volumes/mosquitto/data/
99
sudo mkdir -p ./volumes/mosquitto/log/
10+
sudo mkdir -p ./volumes/mosquitto/pwfile/
1011
sudo chown -R 1883:1883 ./volumes/mosquitto/
1112
fi
1213

‎.templates/mosquitto/mosquitto.conf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
persistence true
22
persistence_location /mosquitto/data/
3-
log_dest file /mosquitto/log/mosquitto.log
3+
#log_dest file /mosquitto/log/mosquitto.log
4+
# To avoid flash wearing
5+
log_dest stdout
46

57
#Uncomment to enable passwords
6-
#password_file /mosquitto/config/pwfile
8+
#password_file /mosquitto/pwfile/pwfile
79
#allow_anonymous false
810

911
#Uncomment to enable filters
1012
#acl_file /mosquitto/config/filter.acl
13+
14+
log_timestamp_format %Y-%m-%dT%H:%M:%S

0 commit comments

Comments
 (0)