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

View File

@ -61,18 +61,11 @@ services:
- "traefik.http.routers.gitea.tls=true"
- "traefik.http.routers.gitea.tls.certresolver=myresolver"
- "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
#- "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"
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
depends_on:
- gitea-db
networks:

View File

@ -36,12 +36,7 @@ services:
volumes:
- ${NEXTCLOUD_ROOT}/redis:/data
- /etc/localtime:/etc/localtime:ro
<<<<<<< HEAD
- /etc/timezone:/etc/timezone:ro
=======
- /etc/timezone:/etc/timezone:ro
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
nextcloud-app:
depends_on:
@ -151,5 +146,3 @@ services:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./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_max=4000
skip-host-cache
<<<<<<< HEAD
skip-name-resolve
=======
skip-name-resolve
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

View File

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

View File

@ -1,8 +1,2 @@
<<<<<<< HEAD
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.
>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
Still checking performance if there is no package loss.

View File

@ -2,9 +2,8 @@ version: '3.5'
networks:
default:
<<<<<<< HEAD
external:
name: traefik_default
external:
name: traefik_default
services:
teamspeak-app:
@ -42,9 +41,6 @@ teamspeak-db:
restart: unless-stopped
volumes:
- ./db:/var/lib/mysql
=======
external:
name: traefik_default
services:
teamspeak-app: