From f9aa9d4f5981a20777042e529924a4c1b29f30f2 Mon Sep 17 00:00:00 2001 From: kelin Date: Tue, 10 Feb 2026 21:05:32 -0500 Subject: [PATCH] Update docker-compose files and ez-homelab script - Modified arcane and core docker-compose.yml files - Updated ez-homelab.sh script --- docker-compose/arcane/docker-compose.yml | 3 -- docker-compose/core/docker-compose.yml | 2 +- scripts/ez-homelab.sh | 38 ++++++++++++------------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/docker-compose/arcane/docker-compose.yml b/docker-compose/arcane/docker-compose.yml index f73d645..75370c0 100644 --- a/docker-compose/arcane/docker-compose.yml +++ b/docker-compose/arcane/docker-compose.yml @@ -35,9 +35,6 @@ services: # networks: # - traefik-network -volumes: - arcane-data: - networks: traefik-network: external: true \ No newline at end of file diff --git a/docker-compose/core/docker-compose.yml b/docker-compose/core/docker-compose.yml index d38398f..f764d19 100644 --- a/docker-compose/core/docker-compose.yml +++ b/docker-compose/core/docker-compose.yml @@ -114,7 +114,7 @@ services: environment: - TZ=${TZ} - WEBPASSWORD=${PIHOLE_PASSWORD} - - FTLCONF_LOCAL_IPV4=192.168.4.4 + - FTLCONF_LOCAL_IPV4=${SERVER_IP} dns: - 127.0.0.1 - 1.1.1.1 diff --git a/scripts/ez-homelab.sh b/scripts/ez-homelab.sh index 2600ad0..cf3bb78 100755 --- a/scripts/ez-homelab.sh +++ b/scripts/ez-homelab.sh @@ -1,7 +1,5 @@ #!/bin/bash -# EZ-Homelab Unified Setup & Deployment Script - -# Removed set -e to allow graceful error handling +# EZ-Homelab Setup & Deployment Script # Debug logging configuration DEBUG=${DEBUG:-false} @@ -2208,7 +2206,7 @@ deploy_traefik_stack() { http: routers: traefik-dashboard: - rule: "Host(\`traefik.${SERVER_HOSTNAME}.kelinreij.duckdns.org\`)" + rule: "Host(\`traefik.${SERVER_HOSTNAME}.${DOMAIN}\`)" entryPoints: - web service: api@internal @@ -2603,13 +2601,17 @@ main() { echo "║ Deployment Complete! ║" echo "║ SSL Certificates may take a few minutes to be issued. ║" echo "║ ║" - echo "║ https://dockge.${DOMAIN} ║" - echo "║ http://${SERVER_IP}:5001 ║" - echo "║ ║" - echo "║ https://homepage.${DOMAIN} ║" - echo "║ http://${SERVER_IP}:3003 ║" + echo "║ Dockge https://dockge.${DOMAIN}" + echo "║ http://${SERVER_IP}:5001" + echo "║" + echo "║ Arcane https://arcane.${SERVER_HOSTNAME}.${DOMAIN}" + echo "║ http://${SERVER_IP}:3552" + echo "║" + echo "║ Homepage https://homepage.${DOMAIN}" + echo "║ http://${SERVER_IP}:3003 ║" echo "║ ║" echo "╚═════════════════════════════════════════════════════════════╝" + echo "" # Show consolidated warnings if any if [ -n "$GLOBAL_MISSING_VARS" ] || [ -n "$TLS_ISSUES_SUMMARY" ]; then @@ -2631,19 +2633,17 @@ main() { echo "║ ║" fi fi - echo "╚═════════════════════════════════════════════════════════════╝" - echo "╔══════════════════════════════════════════╗" - echo "║ 📚 RESOURCES ║" - echo "╚══════════════════════════════════════════╝" - echo "" - echo " 📖 Documentation: $REPO_DIR/docs/" - echo " 🔧 Quick Reference: $REPO_DIR/docs/quick-reference.md" - echo " 🐙 Repository: https://github.com/your-repo/ez-homelab" - echo " 📋 Wiki: https://github.com/your-repo/ez-homelab/wiki" + echo "╔═════════════════════════════════════════════════════════════╗" + echo "║ RESOURCES ║" + echo "║ ║" + echo "║ Documentation: ~/EZ-Homelab/docs ║" + echo "║ Repository: https://github.com/kelinfoxy/EZ-Homelab ║" + echo "║ Wiki: https://github.com/kelinfoxy/EZ-Homelab/wiki ║" + echo "║ ║" + echo "╚═════════════════════════════════════════════════════════════╝" echo "" debug_log "Script completed successfully" - echo "" } # Run main function