public/malta-workshop
2
0
Fork 0
Code Pull Requests Activity

feat: complete co-op cloud tutorial configurations

Browse Source
This commit is contained in:
Michael Czechowski
2025-08-16 23:23:19 +02:00
parent 94880d476e
commit 7320ca5642
2 changed files with 78 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
common.nix
View File

@@ -70,13 +70,26 @@ in
isoConfig // { isoConfig // {
system.stateVersion = "25.05"; system.stateVersion = "25.05";
services.openssh = {
enable = true;
settings = {
PermitRootLogin = "no";
PasswordAuthentication = true;
PubkeyAuthentication = true;
};
ports = [ 22 ];
};
networking = { networking = {
wireless.enable = false; # Disable to avoid conflicts wireless.enable = false;
networkmanager = { networkmanager = {
enable = true; enable = true;
dns = "none"; # Critical: Don't let NetworkManager manage DNS dns = "none";
}; };
hostName = if isLiveIso then "workshop-live" else "workshop-vm"; hostName = if isLiveIso then "workshop-live" else "workshop-vm";
hosts = {
"127.0.0.1" = [ "workshop.local" "localhost" ];
};
}; };
# Configure dnsmasq properly for wildcard DNS # Configure dnsmasq properly for wildcard DNS
@@ -200,6 +213,17 @@ isoConfig // {
# Ensure workshop user is in docker group # Ensure workshop user is in docker group
usermod -aG docker workshop usermod -aG docker workshop
# Create proper abra server configuration
if [ ! -f /home/workshop/.abra/servers/workshop.local.env ]; then
sudo -u workshop mkdir -p /home/workshop/.abra/servers/
# Set up autocomplete
if command -v abra &> /dev/null; then
sudo -u workshop abra autocomplete bash > /home/workshop/.abra/autocomplete.bash
echo "source ~/.abra/autocomplete.bash" >> /home/workshop/.bashrc
fi
fi
# Test final DNS resolution # Test final DNS resolution
if ${pkgs.dnsutils}/bin/nslookup test.workshop.local 127.0.0.1; then if ${pkgs.dnsutils}/bin/nslookup test.workshop.local 127.0.0.1; then
echo "🎉 All services ready!" echo "🎉 All services ready!"
@@ -260,113 +284,65 @@ isoConfig // {
} }
complete -F _workshop_completion deploy browser connect complete -F _workshop_completion deploy browser connect
setup-traefik() { setup-traefik() {
echo "🔧 Setting up local Traefik proxy..." echo "🔧 Setting up local Traefik proxy..."
# Test DNS first # Ensure we can SSH to workshop.local first (tutorial requirement)
if ! nslookup traefik.workshop.local 127.0.0.1 >/dev/null 2>&1; then if ! ssh -o ConnectTimeout=3 -o BatchMode=yes workshop@workshop.local echo "SSH OK" 2>/dev/null; then
echo "❌ DNS not resolving *.workshop.local" echo "⚠️ SSH to workshop.local not working, but continuing with local setup..."
echo "🔄 Restarting dnsmasq..." fi
sudo systemctl restart dnsmasq
sleep 3
if ! nslookup traefik.workshop.local 127.0.0.1 >/dev/null 2>&1; then # DNS check
echo "❌ DNS still not working!" if ! nslookup traefik.workshop.local 127.0.0.1 >/dev/null 2>&1; then
return 1 echo "❌ DNS not resolving *.workshop.local"
fi sudo systemctl restart dnsmasq
fi sleep 3
fi
echo "✅ DNS resolution working" # Docker Swarm + proxy network
if ! docker info 2>/dev/null | grep -q "Swarm: active"; then
echo "🔥 Initializing Docker Swarm..."
docker swarm init --advertise-addr 127.0.0.1
fi
# Ensure Docker Swarm is initialized if ! docker network ls | grep -q "proxy"; then
if ! docker info 2>/dev/null | grep -q "Swarm: active"; then echo "📡 Creating proxy overlay network..."
echo "🔥 Initializing Docker Swarm..." docker network create -d overlay proxy
docker swarm init --advertise-addr 127.0.0.1 || true fi
sleep 2
fi
# Create proxy network (CRITICAL for Traefik) # Add server (tutorial step)
if ! docker network ls | grep -q "proxy"; then if ! abra server ls 2>/dev/null | grep -q "workshop.local"; then
echo "📡 Creating proxy overlay network..." echo "🏗 Adding workshop.local server..."
docker network create -d overlay proxy # Try to add as proper domain first, fallback to --local
fi abra server add workshop.local 2>/dev/null || abra server add --local
fi
# Ensure abra is available # Create Traefik app (tutorial step 1)
if ! command -v abra &> /dev/null; then if ! abra app ls 2>/dev/null | grep -q "traefik"; then
echo "❌ Abra not found. Installing..." echo "🚀 Creating Traefik app..."
sudo systemctl restart workshop-abra-setup abra app new traefik --domain=traefik.workshop.local
sleep 5 fi
export PATH="$HOME/.local/bin:$PATH"
fi
# Check current server setup # Configure Traefik (tutorial step 2)
echo "📋 Current servers:" echo "⚙️ Configuring Traefik..."
abra server ls || echo "No servers configured" abra app config traefik.workshop.local
# Add local server if not exists (default name is "default") # Deploy Traefik (tutorial step 3)
if ! abra server ls 2>/dev/null | grep -q "default"; then echo "📦 Deploying Traefik..."
echo "🏗 Adding local server context..." abra app deploy traefik.workshop.local
abra server add --local
sleep 2
fi
# Verify server is accessible # Wait and verify
echo "📋 Servers after setup:" echo "⏳ Waiting for Traefik..."
abra server ls for i in {1..30}; do
if curl -s http://traefik.workshop.local >/dev/null 2>&1; then
echo "✅ Traefik ready! Dashboard: http://traefik.workshop.local"
return 0
fi
sleep 2
done
# Check if Traefik app already exists echo "⚠️ Traefik may still be starting. Check: abra app logs traefik.workshop.local"
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 deployment timed out but may still be starting..."
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() { deploy() {
if [ -z "$1" ]; then if [ -z "$1" ]; then

3
flake.nix
View File

@@ -89,6 +89,9 @@
"gtk" "gtk"
"-monitor" "-monitor"
"stdio" "stdio"
# Add port forwarding for SSH
"-netdev" "user,id=net0,hostfwd=tcp::2222-:22"
"-device" "virtio-net,netdev=net0"
]; ];
# Fix the auto-login conflict with mkForce # Fix the auto-login conflict with mkForce
services.displayManager.autoLogin = lib.mkForce { services.displayManager.autoLogin = lib.mkForce {