diff --git a/homelab/jafner-net/scripts/apply_minecraft_server_list.sh b/homelab/jafner-net/scripts/apply_minecraft_server_list.sh index 0c118d09..adcb50c0 100755 --- a/homelab/jafner-net/scripts/apply_minecraft_server_list.sh +++ b/homelab/jafner-net/scripts/apply_minecraft_server_list.sh @@ -1,9 +1,9 @@ #!/bin/bash DIR=$(pwd) # Apply updated EXPORT_SERVERS -cd /home/joey/homelab/server/config/monitoring && docker-compose up -d --force-recreate exporter-minecraft +cd /home/joey/homelab/jafner-net/config/monitoring && docker-compose up -d --force-recreate exporter-minecraft # Apply updated router mappings -cd /home/joey/homelab/server/config/minecraft && docker-compose up -d --force-recreate router +cd /home/joey/homelab/jafner-net/config/minecraft && docker-compose up -d --force-recreate router cd $DIR \ No newline at end of file diff --git a/homelab/jafner-net/scripts/boot.sh b/homelab/jafner-net/scripts/boot.sh index 85b07ee2..618051af 100755 --- a/homelab/jafner-net/scripts/boot.sh +++ b/homelab/jafner-net/scripts/boot.sh @@ -1,6 +1,6 @@ #!/bin/bash # Remove existing containers to ensure clean environment -for service in /home/joey/homelab/server/config/* +for service in /home/joey/homelab/jafner-net/config/* do echo "CLEANING UP $service" cd $service @@ -24,7 +24,7 @@ do done echo "STARTING DOCKER SERVICES" -for service in /home/joey/homelab/server/config/* +for service in /home/joey/homelab/jafner-net/config/* do echo "===== STARTING $service =====" cd $service diff --git a/homelab/jafner-net/scripts/compose_config.sh b/homelab/jafner-net/scripts/compose_config.sh index c011500e..ddc2cbdf 100755 --- a/homelab/jafner-net/scripts/compose_config.sh +++ b/homelab/jafner-net/scripts/compose_config.sh @@ -6,7 +6,7 @@ PASS="" echo "==============================" echo "========== STARTING ==========" echo "==============================" -for servicedir in /home/joey/homelab/server/config/* +for servicedir in /home/joey/homelab/jafner-net/config/* do service="$(basename $servicedir)" echo "===== CHECKING $service" diff --git a/homelab/jafner-net/scripts/compose_down.sh b/homelab/jafner-net/scripts/compose_down.sh index c6345efc..f3a388f9 100755 --- a/homelab/jafner-net/scripts/compose_down.sh +++ b/homelab/jafner-net/scripts/compose_down.sh @@ -3,7 +3,7 @@ echo "===========================================" echo "======= SHUTTING DOWN SERVERS =======" echo "===========================================" -for service in /home/joey/homelab/server/config/* +for service in /home/joey/homelab/jafner-net/config/* do echo "===== SHUTTING DOWN $service =====" cd $service diff --git a/homelab/jafner-net/scripts/compose_up.sh b/homelab/jafner-net/scripts/compose_up.sh index 33e876be..16150dce 100755 --- a/homelab/jafner-net/scripts/compose_up.sh +++ b/homelab/jafner-net/scripts/compose_up.sh @@ -7,7 +7,7 @@ echo "===========================================" for service in traefik keycloak ddns docker-socket-proxy do echo "===== STARTING $service =====" - cd /home/joey/homelab/server/config/$service + cd /home/joey/homelab/jafner-net/config/$service docker-compose up -d done @@ -15,7 +15,7 @@ done echo "===========================================" echo "========== STARTING MAIN SERVERS ==========" echo "===========================================" -for service in /home/joey/homelab/server/config/* +for service in /home/joey/homelab/jafner-net/config/* do echo "===== STARTING $service =====" cd $service diff --git a/homelab/jafner-net/scripts/compose_up_minimal.sh b/homelab/jafner-net/scripts/compose_up_minimal.sh index 64eaa373..2d8ea381 100755 --- a/homelab/jafner-net/scripts/compose_up_minimal.sh +++ b/homelab/jafner-net/scripts/compose_up_minimal.sh @@ -3,11 +3,11 @@ START_DIR=$(pwd) echo "==============================================" echo "========== STARTING MINIMAL SERVERS ==========" echo "==============================================" -cd /home/joey/homelab/server/config/ +cd /home/joey/homelab/jafner-net/config/ for service in gitlab homer keycloak monitoring traefik wireguard do echo "===== STARTING $service =====" - cd /home/joey/homelab/server/config/$service + cd /home/joey/homelab/jafner-net/config/$service docker-compose up -d done diff --git a/homelab/jafner-net/scripts/compose_up_new.sh b/homelab/jafner-net/scripts/compose_up_new.sh index 2c09139c..002c43a3 100755 --- a/homelab/jafner-net/scripts/compose_up_new.sh +++ b/homelab/jafner-net/scripts/compose_up_new.sh @@ -7,7 +7,7 @@ echo "===========================================" for service in traefik keycloak ddns do echo "===== STARTING $service =====" - cd /home/joey/homelab/server/config/$service + cd /home/joey/homelab/jafner-net/config/$service docker-compose up -d done @@ -15,7 +15,7 @@ done echo "===========================================" echo "========== STARTING MAIN SERVERS ==========" echo "===========================================" -for service in /home/joey/homelab/server/config/* +for service in /home/joey/homelab/jafner-net/config/* do echo "===== STARTING $service =====" cd $service diff --git a/homelab/jafner-net/scripts/nas_down.sh b/homelab/jafner-net/scripts/nas_down.sh index 61f2438f..72a09dcf 100755 --- a/homelab/jafner-net/scripts/nas_down.sh +++ b/homelab/jafner-net/scripts/nas_down.sh @@ -14,12 +14,12 @@ # done ## -## This block checks all projects within the ~/homelab/server/config directory for NAS-dependence +## This block checks all projects within the ~/homelab/jafner-net/config directory for NAS-dependence NAS_DEPENDENTS="" -for project in $(find ~/homelab/server/config -maxdepth 1 -mindepth 1 -path ~/homelab/server/config/minecraft -prune -o -print | cut -d "/" -f7) +for project in $(find ~/homelab/jafner-net/config -maxdepth 1 -mindepth 1 -path ~/homelab/jafner-net/config/minecraft -prune -o -print | cut -d "/" -f7) do echo "======== CHECKING $project ========" - cd ~/homelab/server/config/$project + cd ~/homelab/jafner-net/config/$project docker-compose config | grep -q /mnt/nas MATCH=$? if [ $MATCH == 0 ]; then @@ -35,6 +35,6 @@ echo -e "$NAS_DEPENDENTS" for project in $(echo -e "$NAS_DEPENDENTS") do echo "======== SHUTTING DOWN $project ========" - cd ~/homelab/server/config/$project + cd ~/homelab/jafner-net/config/$project docker-compose down done \ No newline at end of file diff --git a/homelab/jafner-net/scripts/nas_up.sh b/homelab/jafner-net/scripts/nas_up.sh index ac070489..590bf74b 100755 --- a/homelab/jafner-net/scripts/nas_up.sh +++ b/homelab/jafner-net/scripts/nas_up.sh @@ -14,12 +14,12 @@ # done ## -## This block checks all projects within the ~/homelab/server/config directory for NAS-dependence +## This block checks all projects within the ~/homelab/jafner-net/config directory for NAS-dependence NAS_DEPENDENTS="" -for project in $(find ~/homelab/server/config -maxdepth 1 -mindepth 1 -path ~/homelab/server/config/minecraft -prune -o -print | cut -d "/" -f7) +for project in $(find ~/homelab/jafner-net/config -maxdepth 1 -mindepth 1 -path ~/homelab/jafner-net/config/minecraft -prune -o -print | cut -d "/" -f7) do echo "======== CHECKING $project ========" - cd ~/homelab/server/config/$project + cd ~/homelab/jafner-net/config/$project docker-compose config | grep -q /mnt/nas MATCH=$? if [ $MATCH == 0 ]; then @@ -35,6 +35,6 @@ echo -e "$NAS_DEPENDENTS" for project in $(echo -e "$NAS_DEPENDENTS") do echo "======== STARTING UP $project ========" - cd ~/homelab/server/config/$project + cd ~/homelab/jafner-net/config/$project docker-compose up -d done \ No newline at end of file diff --git a/homelab/jafner-net/scripts/update_minecraft_server_list.sh b/homelab/jafner-net/scripts/update_minecraft_server_list.sh index f723aef5..f27235c8 100755 --- a/homelab/jafner-net/scripts/update_minecraft_server_list.sh +++ b/homelab/jafner-net/scripts/update_minecraft_server_list.sh @@ -1,7 +1,7 @@ #!/bin/bash # Get list of configured servers # One server per line, includes router -SERVERS="$(docker-compose -f /home/joey/homelab/server/config/minecraft/docker-compose.yml config --services)" +SERVERS="$(docker-compose -f /home/joey/homelab/jafner-net/config/minecraft/docker-compose.yml config --services)" # exporter-minecraft: Create comma-separated list for EXPORT_SERVERS EXPORT_SERVERS="" @@ -11,7 +11,7 @@ do then EXPORT_SERVERS="${EXPORT_SERVERS}${EXPORT_SERVERS:+,}$server" fi done -echo "EXPORT_SERVERS=\"$EXPORT_SERVERS\"" > /home/joey/homelab/server/config/monitoring/exporter-minecraft.env +echo "EXPORT_SERVERS=\"$EXPORT_SERVERS\"" > /home/joey/homelab/jafner-net/config/monitoring/exporter-minecraft.env # router: Create valid and correct mapping command for mc-router # example: command: --mapping=vanilla.jafner.net=vanilla:25565,e9.jafner.net=e9:25565,fan.jafner.net=fan:25565,vanilla2.jafner.net=vanilla2:25565,bmcp.jafner.net=bmcp:25565 --api-binding=0.0.0.0:25566 @@ -27,4 +27,4 @@ do done #COMMAND="command: --mapping=$MAPPINGS --api-binding=0.0.0.0:25566" -sed -i "s/--mapping=[^ ]\+/--mapping=$MAPPINGS/m" /home/joey/homelab/server/config/minecraft/docker-compose.yml \ No newline at end of file +sed -i "s/--mapping=[^ ]\+/--mapping=$MAPPINGS/m" /home/joey/homelab/jafner-net/config/minecraft/docker-compose.yml \ No newline at end of file