refactor: improve local development environment setup

common.nix

@@ -12,22 +12,58 @@ let
   # Complete Co-op Cloud recipe list (based on your ABRA_RECIPES.md and more)
   allRecipes = [
     # Tier 1 - Production Ready (Score 5)
-    "gitea" "mealie" "nextcloud"
+    "gitea"
+    "mealie"
+    "nextcloud"
 
     # Tier 2 - Stable (Score 4)
-    "gotosocial" "wordpress"
+    "gotosocial"
+    "wordpress"
 
     # Tier 3 - Community (Score 3)
-    "collabora" "croc" "custom-php" "dokuwiki" "engelsystem" "fab-manager"
+    "collabora"
-    "ghost" "karrot" "lauti" "loomio" "mattermost" "mattermost-lts" "mrbs"
+    "croc"
-    "onlyoffice" "open-inventory" "outline" "owncast" "rallly"
+    "custom-php"
+    "dokuwiki"
+    "engelsystem"
+    "fab-manager"
+    "ghost"
+    "karrot"
+    "lauti"
+    "loomio"
+    "mattermost"
+    "mattermost-lts"
+    "mrbs"
+    "onlyoffice"
+    "open-inventory"
+    "outline"
+    "owncast"
+    "rallly"
 
     # Additional recipes from Co-op Cloud catalog
-    "hedgedoc" "mediawiki" "seafile" "jitsi-meet" "matrix-synapse" 
+    "hedgedoc"
-    "rocketchat" "prestashop" "invoiceninja" "kimai" "pretix"
+    "mediawiki"
-    "drone" "n8n" "gitlab" "jupyter-lab" "plausible" "matomo"
+    "seafile"
-    "uptime-kuma" "grafana" "peertube" "funkwhale" "mastodon"
+    "jitsi-meet"
-    "pixelfed" "jellyfin"
+    "matrix-synapse"
+    "rocketchat"
+    "prestashop"
+    "invoiceninja"
+    "kimai"
+    "pretix"
+    "drone"
+    "n8n"
+    "gitlab"
+    "jupyter-lab"
+    "plausible"
+    "matomo"
+    "uptime-kuma"
+    "grafana"
+    "peertube"
+    "funkwhale"
+    "mastodon"
+    "pixelfed"
+    "jellyfin"
   ];
 in
 
@@ -35,10 +71,10 @@ isoConfig // {
   system.stateVersion = "25.05";
 
   networking = {
-    wireless.enable = false;  # Disable to avoid conflicts
+    wireless.enable = false; # Disable to avoid conflicts
     networkmanager = {
       enable = true;
-      dns = "none";  # Critical: Don't let NetworkManager manage DNS
+      dns = "none"; # Critical: Don't let NetworkManager manage DNS
     };
     hostName = if isLiveIso then "workshop-live" else "workshop-vm";
   };
@@ -108,7 +144,7 @@ isoConfig // {
     tree
     nano
     dnsutils
-    dig  # For DNS debugging
+    dig # For DNS debugging
   ];
 
   # Auto-install abra and setup Docker Swarm
@@ -227,7 +263,7 @@ isoConfig // {
       setup-traefik() {
         echo "🔧 Setting up local Traefik proxy..."
 
-        # Test DNS first
+          # Test DNS first
         if ! nslookup traefik.workshop.local 127.0.0.1 >/dev/null 2>&1; then
           echo "❌ DNS not resolving *.workshop.local"
           echo "🔄 Restarting dnsmasq..."
@@ -236,97 +272,134 @@ isoConfig // {
 
           if ! nslookup traefik.workshop.local 127.0.0.1 >/dev/null 2>&1; then
             echo "❌ DNS still not working!"
-            echo "🔍 Debug info:"
-            echo "  systemctl status dnsmasq"
-            echo "  nslookup traefik.workshop.local 127.0.0.1"
             return 1
           fi
         fi
 
         echo "✅ DNS resolution working"
 
-        # Rest of your existing setup-traefik function...
+          # Ensure Docker Swarm is initialized
+        if ! docker info 2>/dev/null | grep -q "Swarm: active"; then
+          echo "🔥 Initializing Docker Swarm..."
+          docker swarm init --advertise-addr 127.0.0.1 || true
+          sleep 2
+        fi
+
+          # Create proxy network (CRITICAL for Traefik)
+        if ! docker network ls | grep -q "proxy"; then
+          echo "📡 Creating proxy overlay network..."
+          docker network create -d overlay proxy
+        fi
+
+          # Ensure abra is available
         if ! command -v abra &> /dev/null; then
           echo "❌ Abra not found. Installing..."
           sudo systemctl restart workshop-abra-setup
           sleep 5
           export PATH="$HOME/.local/bin:$PATH"
         fi
-        # Ensure Docker Swarm is ready
-        if ! docker info 2>/dev/null | grep -q "Swarm: active"; then
-          echo "🔥 Initializing Docker Swarm..."
-          docker swarm init --advertise-addr 127.0.0.1 || true
-        fi
-        # Create abra context if not exists
-        if ! abra server ls 2>/dev/null | grep -q "workshop-local"; then
-          echo "🏗 Creating local abra context..."
-          abra server add --local
-        fi
-				#echo "🚀 Deploying Traefik..."
-				#abra app new traefik -S --domain=traefik.workshop.local --server=workshop-local
-				#abra app deploy traefik.workshop.local
 
-        # Wait for Traefik to be ready
+          # Check current server setup
-        echo "⏳ Waiting for Traefik to start..."
+        echo "📋 Current servers:"
-        for i in {1..30}; do
+        abra server ls || echo "No servers configured"
-          if curl -s http://traefik.workshop.local >/dev/null 2>&1; then
+
-            echo "✅ Traefik deployed! Dashboard: http://traefik.workshop.local"
+          # Add local server if not exists (default name is "default")
-            echo "🚀 Now you can deploy apps with 'deploy <recipe>'"
+        if ! abra server ls 2>/dev/null | grep -q "default"; then
+          echo "🏗 Adding local server context..."
+          abra server add --local
+          sleep 2
+        fi
+
+          # Verify server is accessible
+        echo "📋 Servers after setup:"
+        abra server ls
+
+          # Check if Traefik app already exists
+        if abra app ls 2>/dev/null | grep -q "traefik"; then
+          echo "ℹ️ Traefik already configured"
+          traefik_domain=$(abra app ls | grep traefik | awk \'{print $1}\' | head -1)
+          echo "📍 Existing Traefik: $traefik_domain"
+        else
+          echo "🚀 Creating new Traefik app..."
+
+            # Use proper server context (default, not workshop-local)
+          abra app new traefik --domain=traefik.workshop.local --server=default
+
+            # Configure Traefik environment
+          echo "⚙️ Configuring Traefik..."
+          traefik_env_file="$HOME/.abra/servers/default/traefik.workshop.local.env"
+
+          if [ -f "$traefik_env_file" ]; then
+              # Set required environment variables
+            if ! grep -q "LETS_ENCRYPT_EMAIL" "$traefik_env_file"; then
+              echo "LETS_ENCRYPT_EMAIL=workshop@local.dev" >> "$traefik_env_file"
+            fi
+            if ! grep -q "DASHBOARD_ENABLED" "$traefik_env_file"; then
+              echo "DASHBOARD_ENABLED=true" >> "$traefik_env_file"
+            fi
+          else
+            echo "⚠️ Traefik env file not found at: $traefik_env_file"
+          fi
+
+          echo "📦 Deploying Traefik..."
+          abra app deploy traefik.workshop.local
+
+          traefik_domain="traefik.workshop.local"
+        fi
+
+          # Wait for Traefik to be ready
+        echo "⏳ Waiting for Traefik to be ready..."
+        for i in {1..60}; do
+          if curl -s --connect-timeout 3 --max-time 5 http://traefik.workshop.local/ping >/dev/null 2>&1; then
+            echo "✅ Traefik is ready! Dashboard: http://traefik.workshop.local"
+            echo "🚀 You can now deploy apps with: deploy <recipe>"
             return 0
           fi
+
           sleep 2
         done
 
-        echo "⚠️  Traefik deployed but may still be starting..."
+        echo "⚠️ Traefik deployment timed out but may still be starting..."
-        echo "🔍 Debug: docker service ls | curl -I http://traefik.workshop.local"
+        echo ""
+        echo "🔍 Debug commands:"
+        echo "   abra app ps traefik.workshop.local"
+        echo "   abra app logs traefik.workshop.local"
+        echo "   docker service ls"
+        echo "   docker service logs \$(docker service ls --filter name=traefik -q)"
       }
 
       deploy() {
         if [ -z "$1" ]; then
           echo "Usage: deploy <recipe>"
-          echo "Example: deploy wordpress"
           echo "Available recipes: $ALL_RECIPES"
-          echo ""
-          echo "🔍 Use tab completion or run 'recipes' for categorized list"
           return 1
         fi
-  
         local recipe="$1"
         local domain="$recipe.workshop.local"
-  
         echo "🚀 Deploying $recipe locally..."
         echo "Domain: $domain"
-  
+          # Ensure Traefik is running first
-        if ! command -v abra &> /dev/null; then
+        if ! curl -s --max-time 3 http://traefik.workshop.local/ping >/dev/null 2>&1; then
-          echo "❌ Abra not found. Run 'sudo systemctl restart workshop-abra-setup'"
+          echo "⚠️ Traefik not responding. Setting up..."
-          return 1
+          setup-traefik || return 1
         fi
-
-        # Check if Traefik is running
-        if ! curl -s http://traefik.workshop.local >/dev/null 2>&1; then
-          echo "⚠️  Traefik not detected. Running setup first..."
-          setup-traefik
-        fi
-  
         echo "📦 Creating app: $recipe"
-        abra app new "$recipe" -S --domain="$domain" --server=workshop-local
+          # Use correct server name
-        
+        abra app new "$recipe" --domain="$domain" --server=default -S 2>/dev/null || \
+        abra app new "$recipe" --domain="$domain" --server=default
         echo "🚀 Deploying app: $domain"
         abra app deploy "$domain"
-  
         echo "⏳ Waiting for deployment..."
         for i in {1..60}; do
-          if curl -s http://$domain >/dev/null 2>&1; then
+          if curl -s --max-time 3 http://$domain >/dev/null 2>&1; then
             echo "✅ Deployed! Access at: http://$domain"
-            echo "🌐 Quick launch: browser $recipe"
             return 0
           fi
           sleep 3
         done
 
-        echo "⚠️  Deployment completed but app may still be starting..."
+        echo "⚠️ Deployment may still be starting..."
-        echo "🔍 Debug: docker service ls | dig @127.0.0.1 $domain +short"
+        echo "🔍 Debug: abra app ps $domain"
-        echo "🌐 Try: browser $recipe (in a few moments)"
       }
 
       connect() {

flake.nix

@@ -68,35 +68,37 @@
           (commonConfig { isLiveIso = false; })
 
           ({ config, pkgs, lib, ... }: {
-             boot.loader.grub.enable = false;
+            boot.loader.grub.enable = false;
-             boot.loader.generic-extlinux-compatible.enable = true;
+            boot.loader.generic-extlinux-compatible.enable = true;
 
-             # Enable networking for VM
+            # Enable networking for VM
-             networking.hostName = "workshop-vm";
+            networking.hostName = "workshop-vm";
-             networking.networkmanager.enable = true;
+            networking.networkmanager.enable = true;
-             networking.firewall.enable = false;
+            networking.firewall.enable = false;
 
-             # Hybrid console configuration - serial primary, GUI available
+            # Hybrid console configuration - serial primary, GUI available
-             boot.kernelParams = [ "console=ttyS0,115200" "console=tty1" ];
+            boot.kernelParams = [ "console=ttyS0,115200" "console=tty1" ];
 
-             # VM specific settings
+            # VM specific settings
-             virtualisation.memorySize = 4096;
+            virtualisation.memorySize = 4096;
-             virtualisation.diskSize = 40000;
+            virtualisation.diskSize = 40000;
 
-             # Hybrid mode: GUI available but serial console primary
+            # Hybrid mode: GUI available but serial console primary
-             virtualisation.qemu.options = [
+            virtualisation.qemu.options = [
-               "-display" "gtk"
+              "-display"
-               "-monitor" "stdio"
+              "gtk"
-             ];
+              "-monitor"
-             # Fix the auto-login conflict with mkForce
+              "stdio"
-             services.displayManager.autoLogin = lib.mkForce {
+            ];
-               enable = true;
+            # Fix the auto-login conflict with mkForce
-               user = "workshop";
+            services.displayManager.autoLogin = lib.mkForce {
-             };
+              enable = true;
-             # Keep GUI session commands for when GUI is used
+              user = "workshop";
-             services.xserver.displayManager.sessionCommands = ''
+            };
-               ${pkgs.xfce.xfce4-terminal}/bin/xfce4-terminal --fullscreen --title="Workshop Terminal" &
+            # Keep GUI session commands for when GUI is used
-             '';
+            services.xserver.displayManager.sessionCommands = ''
+              ${pkgs.xfce.xfce4-terminal}/bin/xfce4-terminal --fullscreen --title="Workshop Terminal" &
+            '';
           })
         ];
       };