feat: add restart policy for abra install service

- Fix bash completion function escape characters: $${...} -> $${...}
- Replace printf with \n escapes with proper heredoc in certificate generation
- Clean up invisible characters that could cause parsing issues

README.md

@@ -2,6 +2,8 @@
 
 Part of the Science in the City Festival - Single-participant learning environments for hands-on Co-op Cloud deployment practice.
 
+See the [workshop slides](https://git.dailysh.it/nextlevelshit/malta-slides) for detailed presentation and materials.
+
 ## 🚀 Quick Start
 
 ```bash
@@ -44,7 +46,7 @@ browser wordpress          # Open directly in Firefox
 ## 💾 USB Environment
 
 Pre-configured with:
-- **Automatic WiFi connection** to workshop network
+- **Automatic WiFi connection** to workshop network (CODE_CRISPIES) or public cafe WiFi (APSFreeWiFi)
 - Docker Swarm + abra installation
 - SSH client for cloud access
 - Wildcard DNS resolution (dnsmasq)

common.nix

@@ -246,27 +246,47 @@ isoConfig
       dns = "none"; # We use dnsmasq
       ensureProfiles = {
         profiles = {
-          "CODE_CRISPIES" = {
-            connection = {
-              id = "CODE_CRISPIES";
-              type = "wifi";
-              autoconnect = true;
-            };
-            wifi = {
-              mode = "infrastructure";
-              ssid = "CODE_CRISPIES";
-            };
-            wifi-security = {
-              key-mgmt = "wpa-psk";
-              psk = "scienceinthecity2025";
-            };
-            ipv4 = {
-              method = "auto";
-            };
-            ipv6 = {
-              method = "auto";
-            };
-          };
+           "CODE_CRISPIES" = {
+             connection = {
+               id = "CODE_CRISPIES";
+               type = "wifi";
+               autoconnect = true;
+             };
+             wifi = {
+               mode = "infrastructure";
+               ssid = "CODE_CRISPIES";
+             };
+             wifi-security = {
+               key-mgmt = "wpa-psk";
+               psk = "scienceinthecity2025";
+             };
+             ipv4 = {
+               method = "auto";
+             };
+             ipv6 = {
+               method = "auto";
+             };
+           };
+           "APSFreeWiFi" = {
+             connection = {
+               id = "APSFreeWiFi";
+               type = "wifi";
+               autoconnect = true;
+             };
+             wifi = {
+               mode = "infrastructure";
+               ssid = "APSFreeWiFi";
+             };
+             wifi-security = {
+               key-mgmt = "none";
+             };
+             ipv4 = {
+               method = "auto";
+             };
+             ipv6 = {
+               method = "auto";
+             };
+           };
         };
       };
     };
@@ -493,8 +513,7 @@ isoConfig
   systemd.services.workshop-abra-install = {
     description = "Install abra CLI system-wide with retry logic and proper verification";
     wantedBy = [ "multi-user.target" ];
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
+    after = [ "workshop-system-setup.service" ];
     path = with pkgs; [
       bash
       wget
@@ -509,69 +528,44 @@ isoConfig
     ];
 
     script = ''
-      # Enhanced installation with proper verification
+      # Plain abra installation
       export TERM=xterm-256color
       export HOME=/root
 
-      # Check if abra is already properly installed (CORRECTED VERIFICATION)
+      # Check if abra is already properly installed
       if sudo abra --version >/dev/null 2>&1; then
         echo "✅ abra already installed and functional"
         exit 0
       fi
 
-      # Wait for actual internet connectivity
-      echo "🌐 Waiting for internet connectivity..."
-      for i in {1..30}; do
-        if curl -s --max-time 5 https://abra.coopcloud.tech >/dev/null 2>&1; then
-          echo "✅ Internet connectivity confirmed"
-          break
-        fi
-        if [ $i -eq 30 ]; then
-          echo "❌ No internet connectivity after 60 seconds"
-          exit 1
-        fi
-        sleep 2
-      done
+      echo "🚀 Installing abra system-wide..."
 
-      # Attempt installation with retry logic
-      for attempt in {1..3}; do
-        echo "🚀 Installing abra (attempt $attempt/3)..."
+      # Plain installation
+      curl -fsSL https://install.abra.coopcloud.tech | bash
 
-        if curl -fsSL https://install.abra.coopcloud.tech | bash; then
-          # Verify installation success using CORRECT check method
-          if sudo abra --version >/dev/null 2>&1; then
-            echo "✅ abra installed successfully"
+      # Verify installation
+      if sudo abra --version >/dev/null 2>&1; then
+        echo "✅ abra installed successfully"
 
-            # Add to bashrc only once
-            if ! grep -q "/root/.local/bin" /root/.bashrc 2>/dev/null; then
-              echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.bashrc
-              echo "✅ Added /root/.local/bin to PATH in /root/.bashrc"
-            fi
-
-            exit 0
-          else
-            echo "⚠️ Installation script completed but abra not functional"
-          fi
-        else
-          echo "❌ Installation attempt $attempt failed"
+        # Add to bashrc only once
+        if ! grep -q "/root/.local/bin" /root/.bashrc 2>/dev/null; then
+          echo 'export PATH="$PATH:/root/.local/bin"' >> /root/.bashrc
+          echo "✅ Added /root/.local/bin to PATH in /root/.bashrc"
         fi
 
-        if [ $attempt -lt 3 ]; then
-          echo "⏳ Retrying in 10 seconds..."
-          sleep 10
-        fi
-      done
-
-      echo "❌ abra installation failed after 3 attempts"
-      exit 1
+        exit 0
+      else
+        echo "❌ abra installation failed"
+        exit 1
+      fi
     '';
 
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;
-      User = "root";
       Restart = "on-failure";
       RestartSec = "30s";
+      User = "root";
       Environment = [
         "TERM=xterm-256color"
         "HOME=/root"
@@ -1208,7 +1202,7 @@ isoConfig
            install() {
              echo "🔄 Checking and repairing abra installation..."
 
-             # Use the CORRECT check method (matches service verification)
+             # Check if abra is already installed
              if sudo abra --version >/dev/null 2>&1; then
                echo "✅ abra is already installed and functional"
                return 0
@@ -1217,18 +1211,17 @@ isoConfig
              echo "🔄 Restarting abra installation service..."
              sudo systemctl restart workshop-abra-install
 
-             # Monitor installation progress
-             echo "📊 Monitoring installation..."
-             for i in {1..30}; do
-               if sudo abra --version >/dev/null 2>&1; then
-                 echo "✅ abra installation completed successfully!"
-                 return 0
-               fi
-               sleep 2
-             done
+             # Wait for service to complete
+             sleep 5
 
-             echo "❌ Installation still not complete. Check status:"
-             echo "   sudo systemctl status workshop-abra-install"
+             # Check if installation succeeded
+             if sudo abra --version >/dev/null 2>&1; then
+               echo "✅ abra installation completed successfully!"
+               return 0
+             else
+               echo "❌ Installation failed. Try running 'install' again or check status:"
+               echo "   sudo systemctl status workshop-abra-install"
+             fi
            }
 
            recipes() {

docs/USB_BOOT_INSTRUCTIONS.md

@@ -71,7 +71,7 @@
 ## Getting Started Commands
 
 ```bash
-# WiFi connects automatically - no manual setup needed!
+# WiFi connects automatically to CODE_CRISPIES or APSFreeWiFi - no manual setup needed!
 # Set up your local environment
 setup
 
@@ -120,7 +120,8 @@ Name: Android, Password: (ask facilitator)
 → Note: Terminal no longer auto-starts to prevent boot hangs
 
 **Can't connect to internet**
-→ WiFi should connect automatically to "CODE_CRISPIES"
+→ WiFi should connect automatically to "CODE_CRISPIES" or "APSFreeWiFi"
+→ If connecting to APSFreeWiFi, complete browser login when prompted
 → If not, use mobile hotspot as backup
 → Check: nmcli connection show --active