Fix some more things

Author: Synthetica9

arion-compose.nix

@@ -102,7 +102,7 @@ in
         ];
         interval = "10s";
         timeout = "5s";
-        start_period = "15m";
+        start_period = "120m";
         retries = 3;
       };
     };

config/nginx.conf

@@ -40,4 +40,4 @@ http {
             proxy_redirect off;
         }
     }
-}
+}

flake.nix

@@ -108,8 +108,8 @@
               environment.systemPackages = with pkgs; [ htop curl ];
 
               virtualisation = {
-                diskSize = 8000; # MB
-                memorySize = 2048; # MB
+                diskSize = 25000; # MB
+                memorySize = 8196; # MB
                 writableStoreUseTmpfs = false;
               };
               services.qemuGuest.enable = true;
@@ -124,20 +124,41 @@
         let
           pkgs = pkgsFor system;
           vm = nixosConfigurations.seabug-vm.config.system.build.vm;
+          path = pkgs.lib.makeBinPath (with pkgs; [
+            busybox
+            curl
+            openssh
+            python3
+            qemu
+            sshpass
+            vm
+          ]);
           program = pkgs.writeShellScript "run-vm" ''
             set -euo pipefail
-            # set -x
+            set -x
 
-            [ -x nixos.qcow2 ] && echo "⚠️ nixos.qcow2 already exists..."
+            export PATH=${pkgs.lib.escapeShellArg path}
+
+            (![ -x nixos.qcow2 ] || echo "⚠️ nixos.qcow2 already exists...")
 
             export QEMU_NET_OPTS="hostfwd=tcp::2221-:22,hostfwd=tcp::8080-:8080"
             export QEMU_OPTS="-serial stdio"
-            ${vm}/bin/run-nixos-vm &
+            run-nixos-vm &
             PID=$!
 
-            sleep 3
-            ${pkgs.sshpass}/bin/sshpass -p toor \
-              ${pkgs.openssh}/bin/ssh root@127.0.0.1 -p 2221 \
+            # Wait for ssh port to open
+            while ! (echo | telnet localhost:2221);
+            do
+              if ! kill -0 $PID; then
+                echo "❌ VM failed to start"
+                exit 1
+              fi
+              sleep 0.2;
+            done
+
+            # Show arion log
+            sshpass -p toor \
+              ssh root@127.0.0.1 -p 2221 \
               -o "UserKnownHostsFile=/dev/null" \
               -o "StrictHostKeyChecking=no" \
               journalctl -f -u arion-seabug.service &
@@ -152,7 +173,7 @@
               sleep 1;
             done
 
-            ${pkgs.python3}/bin/python -m webbrowser http://localhost:8080 &
+            python -m webbrowser http://localhost:8080 &
 
             # Wait for the VM to exit
             wait $PID

seabug-module.nix

@@ -1,7 +1,6 @@
-{ arionModule, seabugOverlay }: { lib
-                                , config
-                                , ...
-                                }:
+{ arionModule, seabugOverlay }:
+{ lib, config, ... }:
+
 with lib; let
   cfg = config.services.seabug;
 in
@@ -17,7 +16,7 @@ in
   ];
 
   config = mkIf cfg.enable {
-    networking.firewall.enable = false;
+    networking.firewall.allowedTCPPorts = [ 8080 ];
     nixpkgs.overlays = [ seabugOverlay ];
     virtualisation.arion = {
       backend = "podman-socket";