update ts3 live.env.tpl

.gitignore

@@ -1,2 +1,14 @@
 # Environment files
 *.env
+
+# Nextcloud collabora file
+loolwsd.xml
+
+# Service folders
+**/bundesdata_web_app/
+**/data/
+**/db/
+**/mariadb/
+**/redis/
+**/html/
+**/volumes/

gitea/docker-compose.yml

@@ -61,10 +61,11 @@ services:
       - "traefik.http.routers.gitea.tls=true"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
-      - "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
-      - "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
-      - "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
+      # SSH
+      #- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
+      #- "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
+      #- "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
+      #- "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
     depends_on:
       - gitea-db
     networks:

nextcloud/collabora/loolwsd.xml.tpl

@@ -9,7 +9,7 @@
     <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
     <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
 
-    <server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">collabora.sporada.eu</server_name>
+    <server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">collabora.domain.com</server_name>
     <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="true" default="loleaflet/../"></file_server_root_path>
 
     <memproportion desc="The maximum percentage of system memory consumed by all of the Collabora Online Development Edition, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
@@ -142,7 +142,7 @@
     <storage desc="Backend storage">
         <filesystem allow="false" />
         <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
-            <host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\\.sporada\\.eu</host>
+            <host desc="Regex pattern of hostname to allow or deny." allow="true">nextcloud\\.domain\\.com</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
             <host desc="Regex pattern of hostname to allow or deny." allow="true">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
@@ -156,7 +156,7 @@
             </locking>
         </wopi>
         <webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
-            <host desc="Hostname to allow" allow="false">nextcloud.sporada.eu</host>
+            <host desc="Hostname to allow" allow="false">nextcloud.domain.com</host>
         </webdav>
         <ssl desc="SSL settings">
 	    <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
@@ -173,7 +173,7 @@
     <admin_console desc="Web admin console settings.">
         <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
         <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
-        <username desc="The username of the admin console. Ignored if PAM is enabled.">sporada</username>
+        <username desc="The username of the admin console. Ignored if PAM is enabled.">username</username>
         <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or loolconfig to set up a secure password.">test</password>
     </admin_console>
 

nextcloud/docker-compose.yml

@@ -38,6 +38,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
       
+
   nextcloud-app:
     depends_on:
       - nextcloud-db

traefik/docker-compose.yml

@@ -110,7 +110,6 @@ services:
       - "--providers.docker.exposedbydefault=false"
       # Entrypoints (not HTTPS)
       - "--entrypoints.web.address=:80"
-      #- "--entrypoints.teamspeak.address=:9987/udp"
       # HTTPS (websecure entrypoint)
       - "--entrypoints.websecure.address=:443"
       # TS3 entrypoints
@@ -142,7 +141,6 @@ services:
       - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)"
       - "traefik.http.routers.http_catchall.entrypoints=web"
       - "traefik.http.routers.http_catchall.middlewares=https-redirect"
-
     ports:
       # The HTTP port
       - "80:80"

ts3/README.md

@@ -1,3 +1,2 @@
-No traefik ready!
-
-This is service is not routed by traefik because the UDP routing causes package loss.
+This is now routed via traefik. 
+Still checking performance if working it is.

ts3/docker-compose.yml

@@ -2,42 +2,42 @@ version: '3.5'
 
 networks:
   default:
-  external:
-  name: traefik_default
+    external:
+      name: traefik_default
 
 services:
   teamspeak-app:
-  networks:
-    - default
-  image: teamspeak:latest
-  env_file: live.env
-  container_name: ts3-service
-  restart: unless-stopped
-  volumes:
-    - ./ts3:/var/ts3server
-  depends_on:
-    - teamspeak-db
-  labels:
-    # Watchtower
-    - "com.centurylinklabs.watchtower.enable=true"
-    # Traefik
-    - "traefik.enable=true"
-    # tcp
-    - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
-    - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
-    - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
-    - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"
-    # udp
-    - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"
-    - "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp"
-    - "traefik.udp.services.teamspeak-udp.loadbalancer.server.port=9987"
+    networks:
+      - default
+    image: teamspeak:latest
+    env_file: live.env
+    container_name: ts3-service
+    restart: unless-stopped
+    volumes:
+      - ./data:/var/ts3server
+    depends_on:
+      - teamspeak-db
+    labels:
+      # Watchtower
+      - "com.centurylinklabs.watchtower.enable=true"
+      # Traefik
+      - "traefik.enable=true"
+      # tcp
+      - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
+      - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
+      - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
+      - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"      
+      # udp
+      - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"
+      - "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp"
+      - "traefik.udp.services.teamspeak-udp.loadbalancer.server.port=9987"
 
-teamspeak-db:
-  networks:
-    - default
-  image: mariadb:10
-  env_file: live.env
-  container_name: ts3-db
-  restart: unless-stopped
-  volumes:
-  - ./db:/var/lib/mysql
+  teamspeak-db:
+    networks:
+      - default
+    image: mariadb:10
+    env_file: live.env
+    container_name: ts3-db
+    restart: unless-stopped
+    volumes:
+      - ./db:/var/lib/mysql