From 7247d0e25f7527de574bf09aaab3c03e725cf962 Mon Sep 17 00:00:00 2001
From: Terry Derks <terry@keiran.us>
Date: Sat, 27 Dec 2025 18:46:18 -0500
Subject: [PATCH] update from current

---
 _grains/lsusb.py          |  6 +++---
 gitea/cpapache.sls        |  3 ++-
 salt/deb_install/init.sls | 23 ++++++++++++++++++-----
 salt/files/minion.jinja   |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/_grains/lsusb.py b/_grains/lsusb.py
index cc981a7..f18b0dd 100644
--- a/_grains/lsusb.py
+++ b/_grains/lsusb.py
@@ -1,6 +1,6 @@
 import re
 import logging
-from subprocess import check_output
+from subprocess import check_output, CalledProcessError
 
 log = logging.getLogger(__name__)
 
@@ -8,8 +8,8 @@ def main():
     dev_re = re.compile(r"Bus\s+(\d+)\s+Device\s+(\d+):\s+ID\s(\w+:\w+)\s(.+)$")
     try:
         lsusb = check_output("lsusb", encoding='UTF-8')
-    except OSError as exc:
-        log.error(exc)
+    except (CalledProcessError, OSError) as exc:
+        log.debug(exc)
         return {}
     devices = []
     corsair_aio = None
diff --git a/gitea/cpapache.sls b/gitea/cpapache.sls
index 210b5b6..fed7483 100644
--- a/gitea/cpapache.sls
+++ b/gitea/cpapache.sls
@@ -6,6 +6,7 @@
     - user: root
     - group: root
     - mode: 644
+    - makedirs: true
 
 verify_vhost_includes:
   cmd.wait:
@@ -25,7 +26,7 @@ queue_httpd_graceful:
     - watch:
       - cmd: rebuildhttpdconf
 
-/home/{{ salt.pillar.get('gitea:user') }}/public_html/.htaccess:
+{{ salt.pillar.get('gitea:docroot') }}/.htaccess:
   file.managed:
     - source: 'salt://gitea/files/htaccess.jinja'
     - template: jinja
diff --git a/salt/deb_install/init.sls b/salt/deb_install/init.sls
index 1e269ad..751076e 100644
--- a/salt/deb_install/init.sls
+++ b/salt/deb_install/init.sls
@@ -1,23 +1,36 @@
 {% from "salt/map.jinja" import salt_daemons with context %}
 {% from "salt/deb_install/map.jinja" import osrelease, oscodename with context %}
 
-/etc/apt/keyrings/salt-archive-keyring-2023.gpg:
+/etc/apt/keyrings/salt-archive-keyring-2023.pgp:
   file.managed:
-    - source: https://repo.saltproject.io/salt/py3/{{ grains['os'].lower() }}/{{ osrelease }}/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
-    - source_hash: c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
+    - source: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+    - source_hash: 36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
 
 /etc/apt/sources.list.d/salt.list:
   file.managed:
-    - contents: "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/{{ grains['os'].lower() }}/{{ osrelease }}/amd64/minor/{{ salt.pillar.get("salt:version") }} {{ oscodename }} main"
+    - contents: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
 
 salt-common:
   pkg.installed:
     - version: '{{ salt.pillar.get("salt:version") }}'
     - refresh: true
     - require:
-      - file: /etc/apt/keyrings/salt-archive-keyring-2023.gpg
+      - file: /etc/apt/keyrings/salt-archive-keyring-2023.pgp
       - file: /etc/apt/sources.list.d/salt.list
 
+salt {{ salt.pillar.get("salt:version") }}:
+  pkg.held:
+    - pkgs:
+      - salt-common
+{% for daemon in salt_daemons %}
+      - salt-{{ daemon }}
+{% endfor %}
+    - require:
+      - pkg: salt-common
+{% for daemon in salt_daemons %}
+      - pkg: salt-{{ daemon }}
+{% endfor %}
+  
 {% for daemon in salt_daemons %}
 salt-{{ daemon }}:
   pkg.installed:
diff --git a/salt/files/minion.jinja b/salt/files/minion.jinja
index c3ebcad..d423db3 100644
--- a/salt/files/minion.jinja
+++ b/salt/files/minion.jinja
@@ -12,4 +12,4 @@ mysql.default_file: '/root/.my.cnf'
 mine_functions:
   root_id_rsa_pub:
     - mine_function: file.read
-    - /root/.ssh/id_rsa.pub
+    - /root/.ssh/id_ed25519.pub