testing

.gitignore

@@ -1,4 +1,4 @@
 .playbook
-.vagrant*
+.vagrant
 .vscode
 /environments/

Vagrantfile

@@ -1,45 +1,43 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require 'yaml'
+SSH_FORWARD=ENV["SSH_FORWARD"]
-settings_path = '.vagrant.yml'
+if !(SSH_FORWARD == "true")
-settings = {}
+  SSH_FORWARD = false
-
-if File.exist?(settings_path)
-  settings = YAML.load_file(settings_path)
 end
 
-VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'debian/bookworm64'
-VAGRANT_CPUS = settings['VAGRANT_CPUS'] || 2
-VAGRANT_MEM  = settings['VAGRANT_MEM']  || 2048
-SSH_FORWARD  = settings['SSH_FORWARD']  || false
-
-# Default to shell environment variable: PLAYBOOK (priority #1)
 PLAYBOOK=ENV["PLAYBOOK"]
 if !PLAYBOOK
-  # PLAYBOOK setting in .vagrant.yml (priority #2)
+  if File.exist?('.playbook')
-  PLAYBOOK = settings['PLAYBOOK'] || false
+    PLAYBOOK = IO.read('.playbook').split("\n")[0]
-  if !PLAYBOOK || PLAYBOOK.empty?
-    puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml"
-    abort
   end
+
+  if !PLAYBOOK || PLAYBOOK.empty?
+    PLAYBOOK = "\nERROR: Set env PLAYBOOK"
+  end
+else
+  File.write(".playbook", PLAYBOOK)
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = VAGRANT_BOX
+  config.vm.box = "debian/bullseye64"
   config.vm.network "private_network", type: "dhcp"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder "./scratch", "/vagrant/scratch"
   config.ssh.forward_agent = SSH_FORWARD
 
-  # Libvrit provider
+  # Machine Name
-  config.vm.provider :libvirt do |libvirt|
+  config.vm.define :moxie do |moxie| #
-    libvirt.cpus   = VAGRANT_CPUS
-    libvirt.memory = VAGRANT_MEM
   end
 
-  # Virtualbox provider
+  config.vm.provider :libvirt do |libvirt|
-  config.vm.provider :virtualbox do |vbox|
+    libvirt.cpus = 2
-    vbox.cpus   = VAGRANT_CPUS
+    libvirt.memory = 4096
-    vbox.memory = VAGRANT_MEM
+    libvirt.default_prefix = ""
+  end
+
+  config.vm.provider "virtualbox" do |vbox|
+    vbox.memory = 4096
   end
 
   # Provision with Ansible
@@ -48,4 +46,5 @@ Vagrant.configure("2") do |config|
     ansible.compatibility_mode = "2.0"
     ansible.playbook = "dev/" + PLAYBOOK + ".yml"
   end
+
 end

dev/host_vars/nginx.yml

@@ -14,7 +14,7 @@ traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
 
-# staticweb
+# nginx
 nginx_domain: nginx.vm.krislamo.org
 nginx_name: staticsite
 nginx_repo_url: https://git.krislamo.org/kris/example-website/

dev/nginx.yml

@@ -1,10 +1,10 @@
-- name: Install a static web container
+- name: Install nginx server (docker)
   hosts: all
   become: true
   vars_files:
-    - host_vars/staticweb.yml
+    - host_vars/nginx.yml
   roles:
     - base
     - docker
     - traefik
-    - staticweb
+    - nginx

run-proxy.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Find private key file
+PRIVATE_KEY="$(find .vagrant -name "private_key")"
+
+# Does the private_key file exist?
+if [ ! -f "$PRIVATE_KEY" ]; then
+  echo "[ERROR] File not found at \"$PRIVATE_KEY\""
+  exit 1
+fi
+
+# Is the private_key a valid SSH key?
+echo "Checking validity of private key at $(pwd)/$PRIVATE_KEY"
+if ! ssh-keygen -l -f "$PRIVATE_KEY"; then
+  echo "[Error] The private key at \"$PRIVATE_KEY\" is invalid (CODE: $?)"
+  exit 1
+fi
+
+# Find an IP on the VM for the SSH tunnel
+HOST_IP="$(vagrant ssh -c "hostname -I | cut -d' ' -f${HOSTNAME_FIELD:-1}" 2>/dev/null | sed 's/.$//')"
+
+# SSH command to match in processes table
+CMD="ssh -fNT -i $PRIVATE_KEY -L 8443:localhost:8443 -L 80:localhost:80 -L 443:localhost:443.*vagrant@$HOST_IP"
+
+# Not just after PIDs
+# shellcheck disable=SC2009
+PS_TUNNELS="$(ps aux | grep -e "$CMD" | grep -v grep)"
+PS_COUNTER="$(echo "$PS_TUNNELS" | wc -l)"
+
+if [ "$PS_COUNTER" -gt 0 ]; then
+  echo "[ERROR] Tunnel(s) already seems to exist (counted $PS_COUNTER)"
+  echo \""$PS_TUNNELS"\"
+  exit 1
+fi
+
+# Create an SSH tunnel
+echo "Starting background SSH connection for localhost port forwarding"
+set -x
+ssh -fNT -i "$PRIVATE_KEY" \
+  -L 8443:localhost:8443 \
+  -L 80:localhost:80 \
+  -L 443:localhost:443 \
+  -o UserKnownHostsFile=/dev/null \
+  -o StrictHostKeyChecking=no \
+    vagrant@"${HOST_IP}" 2>/dev/null
+