.gitignore

@@ -1,6 +1,5 @@
 /adminscripts/Syrupy/*.log
 /adminscripts/Syrupy/*.raw
-/adminscripts/hub_token
 /ftp/conf-*
 /ftp/home-*
 /gitea/gitea_data
@@ -8,7 +7,6 @@
 /notes/standardfile.db
 /notes/standardfile.yml
 /recipes/mealie
-/teamspeak/data
 /terraria/config
 /traefik/letsencrypt
 /traefik/.env

adminscripts/run_all.sh

@@ -1,7 +1,7 @@
 SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 GLOB_DIR=$SCRIPT_DIR/..
 
-SERVICES=( traefik gitea wizz ftp notes recipes teamspeak )
+SERVICES=( traefik gitea wizz ftp notes recipes )
 
 for service in "${SERVICES[@]}"
 do

joplin/docker-compose.yml

@@ -1,37 +0,0 @@
-version: "3.5"
-
-networks:
-  traefik_default:
-    external: true
-  joplin_default:
-    external: false
-
-services:
-  joplin:
-    container_name: joplin
-    image: joplin/server:2.14.1-beta
-    restart: always
-    env_file: ./secrets/joplin.secret
-    networks:
-      - traefik_default
-      - joplin_default
-    depends_on:
-      - db
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.joplin.rule=Host(`joplin.hugowillaume.com`)"
-      - "traefik.http.routers.joplin.entrypoints=websecure"
-      - "traefik.http.routers.joplin.tls.certresolver=myhttpchallenge"
-      - "traefik.http.services.joplin.loadbalancer.server.port=22300"
-
-  db:
-    container_name: joplin_db
-    image: postgres:16
-    networks:
-      - joplin_default
-    env_file: ./secrets/joplin_db.secret
-    volumes:
-        - ./joplin_data/postgres:/var/lib/postgresql/data
-#    ports:
-#        - "5432:5432"
-    restart: always

joplin/secrets/joplin.example

@@ -1,8 +0,0 @@
-APP_PORT=22300
-APP_BASE_URL=https://joplin.hugowillaume.com
-DB_CLIENT=pg
-POSTGRES_PASSWORD=POSTGRES_PASSWORD
-POSTGRES_DATABASE=POSTRES_DATABASE
-POSTGRES_USER=POSTGRES_USER
-POSTGRES_PORT=5432
-POSTGRES_HOST=db

joplin/secrets/joplin_db.example

@@ -1,3 +0,0 @@
-POSTGRES_PASSWORD=POSTGRES_PASSWORD
-POSTGRES_USER=POSTRES_USER
-POSTGRES_DB=POSTGRES_DATABASE

teamspeak/configure_server.sh

@@ -1,24 +0,0 @@
-#required packages: httpie, jq
-
-DOCKER_IP=$(docker inspect --format '{{ range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' teamspeak2)
-BASE_COMMAND="http $DOCKER_IP:10080/1"
-API_KEY="?api-key=$(cat api_key.secret)"
-
-
-#Trying to give Guests permission to move anyone among channels, not working yet so doing it manually in ts3-client
-#GUEST_ID=$($BASE_COMMAND/servergrouplist$API_KEY | jq -r '.body[4].sgid')
-#echo "{\"sgid\": \"$GUEST_ID\", \"permsid\":\"i_client_needed_move_power\", \"permvalue\":0, \"permnegated\":0, \"permskip\":0 }" | $BASE_COMMAND/servergroupaddperm$API_KEY
-#echo
-
-#exit 0
-
-
-AFK_ID=$(echo '{"channel_name": "AFK", "channel_flag_permanent":1, "channel_needed_talk_power":999}' | $BASE_COMMAND/channelcreate$API_KEY | jq -r '.body[0].cid')
-echo "{\"channel_name\": \"Pokez-moi\", \"channel_flag_permanent\":1, \"channel_needed_talk_power\":999, \"cpid\":$AFK_ID}" | $BASE_COMMAND/channelcreate$API_KEY
-echo
-echo '{"channel_name": "Café Sonneveld", "channel_flag_permanent":1}' | $BASE_COMMAND/channelcreate$API_KEY
-echo
-echo '{"channel_name": "Le Coco", "channel_flag_permanent":1}' | $BASE_COMMAND/channelcreate$API_KEY
-echo
-echo '{"channel_name": "STREAM ON", "channel_flag_permanent":1}' | $BASE_COMMAND/channelcreate$API_KEY
-echo

teamspeak/docker-compose.yml

@@ -1,30 +0,0 @@
-version: '3.7'
-
-# Not run through traefik, causes too much slowdown: instead, using a DNS SRV rule.
-services:
-  teamspeak:
-    image: teamspeak
-    container_name: teamspeak
-    ports:
-      - 9987:9987/udp       #udp voice port
-      - 10080:10080
-      - 30033:30033         #file transfer port
-    restart: unless-stopped
-    env_file: ./secrets/teamspeak.secret
-    volumes:
-      - ./data:/var/ts3server/
-    networks:
-      - teamspeak
-  db:
-    image: mariadb
-    restart: always
-    env_file: ./secrets/teamspeak.secret
-    volumes:
-      - ./dbvolume:/var/lib/mysql
-    networks:
-     - teamspeak
-
-
-networks:
-  teamspeak:
-    external: false

teamspeak/secrets/teamspeak.example

@@ -1,11 +0,0 @@
-TS3SERVER_DB_PLUGIN=ts3db_mariadb
-TS3SERVER_DB_SQLCREATEPATH=create_mariadb
-TS3SERVER_DB_HOST=db
-TS3SERVER_DB_USER=root
-TS3SERVER_DB_PASSWORD=password
-TS3SERVER_DB_NAME=dbname
-TS3SERVER_DB_WAITUNTILREADY=30
-TS3SERVER_LICENSE=accept
-
-MYSQL_ROOT_PASSWORD=password
-MYSQL_DATABASE=dbname

terraria/docker-compose.yml

@@ -1,25 +1,23 @@
-version: '3.7'
+version: '3'
 
 services:
   terraria:
-    image: ghcr.io/beardedio/terraria:tshock-5.1.3
+    image: ghcr.io/beardedio/terraria:latest
     container_name: terraria
     ports:
       - '7777:7777'
-      - '7878:7878'
     restart: unless-stopped
-    env_file: ./env.file
+    environment:
+      - world=BurgerFamily.wld
     volumes:
       - ./config:/config
+#    tty: true
+#    stdin_open: true
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.terraria.rule=Host(`terraria.hugowillaume.com`)"
       - "traefik.http.routers.terraria.entrypoints=terraria"
       - "traefik.http.services.terraria.loadbalancer.server.port=7777"
-
-      - "traefik.http.routers.terraria_api.rule=Host(`terraria.hugowillaume.com`)"
-      - "traefik.http.routers.terraria_api.entrypoints=terraria_api"
-      - "traefik.http.services.terraria_api.loadbalancer.server.port=7878"      
     networks:
       - traefik_default
 

terraria/env.file

@@ -1 +0,0 @@
-world=BurgerFamily.wld

traefik/traefik.toml

@@ -11,9 +11,6 @@
   [entryPoints.terraria]
     address = ":7777"
 
-  [entryPoints.terraria_api]
-    address = ":7878"
-
 #[providers.file]
 #   directory = "/etc/traefik/config"