ansible/playbook.yaml

@@ -73,25 +73,25 @@
     - sudo
     - doas
     - users
-    - package_manager
+    # - package_manager
-    - zfs
+    # - zfs
-    - zrepl
+    # - zrepl
-    - zsh
+    # - zsh
-    - network
+    # - network
-    - sshd
+    # - sshd
-    - base
+    # - base
     - firewall
-    - cpu
+    # - cpu
-    - ntp
+    # - ntp
-    - nvme
+    # - nvme
-    - hosts
+    # - hosts
-    - build
+    # - build
-    - devfs
+    # - devfs
-    - jail
+    # - jail
-    - bhyve
+    # - bhyve
-    - wireguard
+    # - wireguard
-    - emacs
+    # - plainmacs
-    - mrmanager
+    # - mrmanager
 
 - hosts: admin_git:public_dns
   vars:

ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash

@@ -35,33 +35,6 @@ if [ "$VERBOSE" = "YES" ]; then
     set -x
 fi
 
-############## Setup #########################
-
-function cleanup {
-    for vm in "${vms[@]}"; do
-        log "Destroying bhyve vm $f"
-        bhyvectl "--vm=$vm" --destroy
-        log "Destroyed bhyve vm $f"
-    done
-}
-vms=()
-for sig in EXIT INT QUIT HUP TERM; do
-  trap "set +e; cleanup" "$sig"
-done
-
-function die {
-    local status_code="$1"
-    shift
-    (>&2 echo "${@}")
-    exit "$status_code"
-}
-
-function log {
-    (>&2 echo "${@}")
-}
-
-############## Program #########################
-
 function main {
     local cmd="$1"
     shift 1
@@ -149,7 +122,6 @@ function start_vm {
     if [ "$VNC_ENABLE" = "YES" ]; then
         additional_args+=("-s" "29,fbuf,tcp=$VNC_LISTEN,w=1920,h=1080")
     fi
-    vms+=("$name")
     while true; do
         set -x
         set +e
@@ -184,6 +156,9 @@ function start_vm {
             break
         fi
     done
+
+    bhyvectl "--vm=$name" --destroy
+    echo "Destroyed bhyve vm."
 }
 
 function detect_available_link {

ansible/roles/build/files/aurutils-update-devel-packages

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Update packages in aurutils with -git suffix.
-#
-# This has to be done manually because aurutils does not check for new git commits every time we run an update.
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-pacman -Slq custom | grep -E -- '-git$' | xargs aurutils-sync --no-ver --reset "$@"

ansible/roles/build/tasks/linux.yaml

@@ -113,8 +113,6 @@
       dest: /usr/local/bin/aurutils-purge
     - src: aurutils-sync
       dest: /usr/local/bin/aurutils-sync
-    - src: aurutils-update-devel-packages
-      dest: /usr/local/bin/
 
 - name: build aurutils inside aurutils
   become_user: "{{ build_user.name }}"

ansible/roles/kubernetes/files/ks

@@ -4,4 +4,4 @@ set -euo pipefail
 IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-exec switcher namespace "$@"
+exec kubens "$@"

ansible/roles/kubernetes/files/kx

@@ -4,4 +4,4 @@ set -euo pipefail
 IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-exec switcher "$@"
+exec kubectx "$@"

ansible/roles/kubernetes/tasks/linux.yaml

@@ -21,6 +21,7 @@
     name:
       - yamllint
       - stern
+      - kubectx
       - kubeswitch
       - flux-scm
       - kubectl-minio

ansible/roles/poudriere/files/poudboot

@@ -1,24 +1,23 @@
 #!/bin/sh
+# /usr/local/etc/rc.d/poudboot
 #
-# PROVIDE: poudboot
 # REQUIRE: FILESYSTEM kld
+# PROVIDE: poudboot
 # AFTER: netif
-# KEYWORD: shutdown
 
 . /etc/rc.subr
-
 name=poudboot
 rcvar=${name}_enable
-desc="Poudriere Loop"
+start_cmd="${name}_start"
-
+stop_cmd="${name}_stop"
 load_rc_config $name
 
-: ${poudboot_enable:=YES}
+poudboot_start() {
+    PATH="${PATH}:/usr/local/bin" /usr/local/bin/poudboot start
+}
 
-command=/usr/sbin/daemon
+poudboot_stop() {
-pidfile=/var/run/${name}.pid
+    PATH="${PATH}:/usr/local/bin" /usr/local/bin/poudboot stop
+}
 
-command_args="-p $pidfile -u root -f -S -T $name poudboot start"
-
-export PATH="${PATH}:/usr/local/bin"
 run_rc_command "$1"

ansible/roles/rust/defaults/main.yaml

@@ -1,2 +1,2 @@
 # Check that rust-analyzer is valid for date on https://rust-lang.github.io/rustup-components-history/
-rust_date: "2023-07-13"
+rust_date: "2023-04-14"