cleanup bastion deployment a bit

group_vars/all.yml

@@ -47,6 +47,7 @@ haproxy:
           - deluge.badjware.dev
           - tavern.badjware.dev
           - actual.badjware.dev
+          - openai.badjware.dev
         backend:
           - server: 192.168.20.20:8443
           - server: 192.168.20.21:8443

group_vars/k3s.yml

@@ -1,4 +1,4 @@
 k3s:
-  version: v1.28.8+k3s1
+  version:  v1.31.4+k3s1
   # disable local-path-provisioner, we use longhorn instead
   extra_server_args: --disable local-storage

hosts

@@ -36,8 +36,8 @@ all:
           nut_client:
             ups: liebert-psi
             sched:
-              # We want to shutdown this server quick
-              on_bat: 15
+              # We want to shutdown this server quicker
+              on_bat: 60
     bastion:
       hosts:
         bastion:

reboot-rpi.yml

@@ -0,0 +1,3 @@
+- hosts: k3s-agent0,k3s-agent1,k3s-agent2,k3s-agent3
+  tasks:
+    - reboot:

roles/haproxy/tasks/main.yml

@@ -42,9 +42,3 @@
     dest: /opt/certbot/certbot-deploy.sh
     mode: '0700'
   notify: Run certbot
-
-- name: Install weekly haproxy reload
-  cron:
-    name: "haproxy reload"
-    special_time: weekly
-    job: "/bin/systemctl reload haproxy"

roles/haproxy/templates/certbot-deploy.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
 cat /etc/letsencrypt/live/{{ letsencrypt.domains[0] }}/fullchain.pem /etc/letsencrypt/live/{{ letsencrypt.domains[0] }}/privkey.pem >/etc/letsencrypt/live/{{ letsencrypt.domains[0] }}/{{ letsencrypt.domains[0] }}.pem
+systemctl restart haproxy

roles/nut-server/templates/62-nut-usbups.rules

@@ -1,7 +1,7 @@
 SUBSYSTEM!="usb", GOTO="nut-usbups_rules_end"
 
 {% for name, config in nut_server.ups.items() %}
-ACTION=="add|change", SUBSYSTEM=="usb|usb_device", SUBSYSTEMS=="usb|usb_device", ATTR{idVendor}=="{{ config.vendorid }}", ATTR{idProduct}=="{{ config.productid }}", MODE="664", GROUP="nut", RUN+="/sbin/upsdrvctl stop; /sbin/upsdrvctl start"
+ACTION=="add|change", SUBSYSTEM=="usb|usb_device", SUBSYSTEMS=="usb|usb_device", ATTR{idVendor}=="{{ config.vendorid }}", ATTR{idProduct}=="{{ config.productid }}", MODE="664", GROUP="nut", RUN+="/sbin/upsdrvctl stop || /sbin/upsdrvctl start"
 {% endfor %}
 
 LABEL="nut-usbups_rules_end"

roles/wireguard/tasks/main.yml

@@ -22,17 +22,19 @@
     creates: /etc/wireguard/private.key
   register: private_key_gen
 
-- name: Fetch private key
+- name: Read private key
   command: cat /etc/wireguard/private.key
   register: private_key
+  changed_when: false
 
 - name: Generate public key
   shell: cat /etc/wireguard/private.key | wg pubkey >/etc/wireguard/public.key
   when: not public_key_stats.stat.exists or private_key_gen.changed
 
-- name: Fetch public key
+- name: Read public key
   command: cat /etc/wireguard/public.key
   register: public_key
+  changed_when: false
 
 - name: Print public key
   debug: