Remove clutter

This commit is contained in:
Stephan Porada 2021-04-29 11:26:15 +02:00
parent 3fa7f9e930
commit 91451e2fd5
7 changed files with 7 additions and 45 deletions

3
.gitignore vendored
View File

@ -1,7 +1,5 @@
# Environment files # Environment files
*.env *.env
<<<<<<< HEAD
=======
# Nextcloud collabora file # Nextcloud collabora file
loolwsd.xml loolwsd.xml
@ -14,4 +12,3 @@ loolwsd.xml
**/redis/ **/redis/
**/html/ **/html/
**/volumes/ **/volumes/
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

View File

@ -61,18 +61,11 @@ services:
- "traefik.http.routers.gitea.tls=true" - "traefik.http.routers.gitea.tls=true"
- "traefik.http.routers.gitea.tls.certresolver=myresolver" - "traefik.http.routers.gitea.tls.certresolver=myresolver"
- "traefik.http.services.gitea.loadbalancer.server.port=3000" - "traefik.http.services.gitea.loadbalancer.server.port=3000"
<<<<<<< HEAD
- "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 # SSH
#- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" #- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
#- "traefik.tcp.routers.gitea-ssh.entrypoints=ssh" #- "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
#- "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc" #- "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
#- "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222" #- "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
depends_on: depends_on:
- gitea-db - gitea-db
networks: networks:

View File

@ -36,12 +36,7 @@ services:
volumes: volumes:
- ${NEXTCLOUD_ROOT}/redis:/data - ${NEXTCLOUD_ROOT}/redis:/data
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
<<<<<<< HEAD
- /etc/timezone:/etc/timezone:ro
=======
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
nextcloud-app: nextcloud-app:
depends_on: depends_on:
@ -151,5 +146,3 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml - ./collabora/loolwsd.xml:/etc/loolwsd/loolwsd.xml

View File

@ -3,8 +3,4 @@ innodb_buffer_pool_size=2G
innodb_io_capacity=4000 innodb_io_capacity=4000
innodb_io_capacity_max=4000 innodb_io_capacity_max=4000
skip-host-cache skip-host-cache
<<<<<<< HEAD
skip-name-resolve skip-name-resolve
=======
skip-name-resolve
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

View File

@ -6,7 +6,7 @@ networks:
socket_proxy: socket_proxy:
external: external:
name: socket_proxy name: socket_proxy
services: services:
# Only accept needed incoming docker API calls # Only accept needed incoming docker API calls
@ -103,17 +103,13 @@ services:
- "--log.level=DEBUG" - "--log.level=DEBUG"
# API and Dashboard # API and Dashboard
#- "--api.insecure=true" #- "--api.insecure=true"
- "--api=true" - "--api=true"
- "--api.dashboard=true" - "--api.dashboard=true"
# Docker as provider # Docker as provider
- "--providers.docker=true" - "--providers.docker=true"
- "--providers.docker.exposedbydefault=false" - "--providers.docker.exposedbydefault=false"
# Entrypoints (not HTTPS) # Entrypoints (not HTTPS)
- "--entrypoints.web.address=:80" - "--entrypoints.web.address=:80"
<<<<<<< HEAD
#- "--entrypoints.teamspeak.address=:9987/udp"
=======
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
# HTTPS (websecure entrypoint) # HTTPS (websecure entrypoint)
- "--entrypoints.websecure.address=:443" - "--entrypoints.websecure.address=:443"
# TS3 entrypoints # TS3 entrypoints
@ -145,10 +141,7 @@ services:
- "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)" - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)"
- "traefik.http.routers.http_catchall.entrypoints=web" - "traefik.http.routers.http_catchall.entrypoints=web"
- "traefik.http.routers.http_catchall.middlewares=https-redirect" - "traefik.http.routers.http_catchall.middlewares=https-redirect"
<<<<<<< HEAD
=======
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
ports: ports:
# The HTTP port # The HTTP port
- "80:80" - "80:80"

View File

@ -1,8 +1,2 @@
<<<<<<< HEAD This is now routed via traefik.
No traefik ready! Still checking performance if there is no package loss.
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.
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

View File

@ -2,9 +2,8 @@ version: '3.5'
networks: networks:
default: default:
<<<<<<< HEAD external:
external: name: traefik_default
name: traefik_default
services: services:
teamspeak-app: teamspeak-app:
@ -42,9 +41,6 @@ teamspeak-db:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./db:/var/lib/mysql - ./db:/var/lib/mysql
=======
external:
name: traefik_default
services: services:
teamspeak-app: teamspeak-app:
@ -67,7 +63,7 @@ services:
- "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp" - "traefik.tcp.routers.teamspeak-tcp.entrypoints=ts-tcp"
- "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp" - "traefik.tcp.routers.teamspeak-tcp.service=teamspeak-tcp"
- "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)" - "traefik.tcp.routers.teamspeak-tcp.rule=HostSNI(`ts3.${DOMAIN}`)"
- "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033" - "traefik.tcp.services.teamspeak-tcp.loadbalancer.server.port=30033"
# udp # udp
- "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp" - "traefik.udp.routers.teamspeak-udp.entrypoints=ts-udp"
- "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp" - "traefik.udp.routers.teamspeak-udp.service=teamspeak-udp"