From 441183291cde67273805f3a129a55e4f3f80b973 Mon Sep 17 00:00:00 2001
From: borgal <mueller.lars@online.de>
Date: Thu, 13 Jan 2022 15:22:15 +0000
Subject: [PATCH] kleine updates

---
 adguard/docker-compose.yml     |  6 +++---
 code-server/docker-compose.yml |  1 +
 gitea/docker-compose.yml       |  2 +-
 knxd/docker-compose.yml        |  5 ++++-
 mumble/docker-compose.yml      |  4 +++-
 papermerge/docker-compose.yml  | 22 ++++++++++++++++++++--
 unifi/docker-compose.yml       |  1 +
 webserver/.env.sample          |  5 -----
 webserver/docker-compose.yml   |  2 ++
 whoogle/docker-compose.yml     |  2 ++
 10 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/adguard/docker-compose.yml b/adguard/docker-compose.yml
index f4e311b..e76a400 100644
--- a/adguard/docker-compose.yml
+++ b/adguard/docker-compose.yml
@@ -12,11 +12,11 @@ services:
     ports:
       - 192.168.0.111:53:53/tcp
       - 192.168.0.111:53:53/udp
-      - 1082:80/tcp
-      - 1443:443/tcp
+#      - 1082:80/tcp
+#      - 1443:443/tcp
       - 3000:3000/tcp
 
     environment:
       - TZ=Europe/Berlin
 
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/code-server/docker-compose.yml b/code-server/docker-compose.yml
index 5df3d87..3935d45 100644
--- a/code-server/docker-compose.yml
+++ b/code-server/docker-compose.yml
@@ -19,6 +19,7 @@ services:
     ports:
       - 8181:8443
       - 8184:5500
+      - 5555:5555
     restart: unless-stopped
 
 volumes:
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index fbdab1e..098a991 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -14,4 +14,4 @@ services:
       - /etc/localtime:/etc/localtime:ro
     ports:
       - "3030:3000"
-      - "222:22"
\ No newline at end of file
+      - "222:22"
diff --git a/knxd/docker-compose.yml b/knxd/docker-compose.yml
index 1dc7847..71e7e01 100644
--- a/knxd/docker-compose.yml
+++ b/knxd/docker-compose.yml
@@ -4,5 +4,8 @@ services:
       image: henfri/knxd:v0.12.6
       container_name: knxd
       network_mode: "host"
-      command: knxd -t 1022 -e 1.1.250 -E 1.1.210:30 -f9 -DTRS -c -B single --send-delay=120 -b ipt:192.168.0.200
+#
+#      Logging kann damit aktiviert werden, wenn es zu Problemen kommt - zum aktivieren muss der Container entfernt werden!!!
+#      command: knxd -t 1022 -e 1.1.250 -E 1.1.210:30 -f9 -DTRS -c -B single --send-delay=120 -b ipt:192.168.0.200
+      command: knxd -e 1.1.250 -E 1.1.210:30 -DTRS -c -i --send-delay=120 -B single -b ipt:192.168.0.200
       restart: always
\ No newline at end of file
diff --git a/mumble/docker-compose.yml b/mumble/docker-compose.yml
index 303f1be..88b17c6 100644
--- a/mumble/docker-compose.yml
+++ b/mumble/docker-compose.yml
@@ -4,7 +4,9 @@ services:
   murmur:
     image: vimagick/murmur
     container_name: mumble
+    volumes:
+      - ./config:/etc/murmur
     ports:
       - "64738:64738/tcp"
       - "64738:64738/udp"
-    restart: always
+    restart: always
\ No newline at end of file
diff --git a/papermerge/docker-compose.yml b/papermerge/docker-compose.yml
index 8a3d36e..287d0dd 100644
--- a/papermerge/docker-compose.yml
+++ b/papermerge/docker-compose.yml
@@ -10,7 +10,9 @@ services:
       - TZ=Europe/Berlin
     volumes:
       - ./Configs:/config
-      - ./Data:/data
+      - documents:/docs
+      - scanner_inbox:/data
+#      - ./Data:/data
     ports:
       - 8010:8000
     depends_on:
@@ -26,4 +28,20 @@ services:
       - TZ=Europe/Berlin
    volumes:
       - ./Database:/config
-   restart: always
\ No newline at end of file
+   restart: always
+
+volumes:
+  documents:
+    name: documents
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=${NFS_SERVER},rw
+      device: ":${PFAD_docs}"
+  scanner_inbox:
+    name: scanner_inbox
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=${NFS_SERVER},rw
+      device: ":${PFAD_inbox}"
diff --git a/unifi/docker-compose.yml b/unifi/docker-compose.yml
index b301642..3ce7af4 100644
--- a/unifi/docker-compose.yml
+++ b/unifi/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     ports:
       - 3478:3478/udp
       - 10001:10001/udp
+#      - 1900:1900/udp
       - 8080:8080
       - 8443:8443
     environment:
diff --git a/webserver/.env.sample b/webserver/.env.sample
index c99d885..1f80ca1 100644
--- a/webserver/.env.sample
+++ b/webserver/.env.sample
@@ -3,11 +3,6 @@ MYSQL_USER=changeMe
 MYSQL_PASSWORD=changeMe
 MYSQL_ROOT_PASSWORD=changeMe
 
-#Code-Server
-PASSWORD=changeMe
-SUDO_PASSWORD=changeMe
-PROXY_DOMAIN=code.meineDomain.de
-
 NFS_SERVER=192.168.0.xxx 	# oder hostname oder Domain
 PFAD_1=/Pfad/zum/Ordner/www
 PFAD_2=/Pfad/zum/Ordner/energie
\ No newline at end of file
diff --git a/webserver/docker-compose.yml b/webserver/docker-compose.yml
index dd97a48..65c1a84 100644
--- a/webserver/docker-compose.yml
+++ b/webserver/docker-compose.yml
@@ -13,6 +13,8 @@ services:
       - www:/var/www/html
       - energie:/var/www/html/knx/archiv
       - /etc/localtime:/etc/localtime:ro
+    labels:
+      - com.centurylinklabs.watchtower.enable="false"
     restart: unless-stopped
 
   database:
diff --git a/whoogle/docker-compose.yml b/whoogle/docker-compose.yml
index 4937e14..d0b0ab0 100644
--- a/whoogle/docker-compose.yml
+++ b/whoogle/docker-compose.yml
@@ -6,4 +6,6 @@ services:
     container_name: whoogle
     ports:
       - 5000:5000
+    volumes:
+      - ./config:/config
     restart: unless-stopped
\ No newline at end of file