From 9cdbd7f70f138b12712ac16edb667992cb87e8b2 Mon Sep 17 00:00:00 2001
From: Alex Tavarez <admin@sukaato.moe>
Date: Wed, 3 Jun 2026 14:58:50 -0400
Subject: [PATCH] changed SSH key file search strings to accord with SSH key
 basename changes

---
 group_vars/armitage.yml | 10 ++++++++--
 group_vars/sukaato.yml  | 10 ++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/group_vars/armitage.yml b/group_vars/armitage.yml
index 18168a8..4366873 100644
--- a/group_vars/armitage.yml
+++ b/group_vars/armitage.yml
@@ -14,13 +14,16 @@ instance: armitage
 operating_system: ~
 # <list[<str>]> of control node or local SSH key basenames
 ssh_keys:
-  - id_ed25519_localhost
+  - ed25519@sukaato.hikiki
+  - ecdsa@sukaato.hikiki
 # <list<dict>> list of administrative users (in Linux, users that can use "sudo")
 admins:
   - username: admin # <str> arbitrary valid user name
     services: ~ # <list[<str>]> if linux system user, assocated servce
     # <list[<str>]> list of control node or local SSH key basenames for this user
-    ssh_keys: "{{ keys }}" 
+    ssh_keys:
+      - ecdsa-37851076-sk@sukaato.hikiki
+      - ecdsa-37851072-sk@sukaato.hikiki
     # <str<vault?>> hashed (and maybe salted) password
     password: !vault |
           $ANSIBLE_VAULT;1.1;AES256
@@ -33,6 +36,9 @@ admins:
           62656663336536373262623062633563646434646431303137306438633937323764633334396539
           64353734613662663063343966356562326661626436663430623430663766343030646333306634
           32353839313235313339353431323837356537336231366564313431313462613333
+# @TODO change 'key' attributes of package entres under 'mngr' section below to 'signkey' 
+# and edit 'roles/init-server/install-pks.yml' accordngly
+# <dict[<str>:<dict>]> package groups
 pkgs:
   # <dict[<str>:<dict>]> representing package groups installed by package manager via repositories
   mngr:
diff --git a/group_vars/sukaato.yml b/group_vars/sukaato.yml
index 318cb77..855c507 100644
--- a/group_vars/sukaato.yml
+++ b/group_vars/sukaato.yml
@@ -25,16 +25,16 @@ origin: us-east
 operating_system: linode/debian13
 # <list[<str>]> list of control node or local SSH key basenames for root user
 ssh_keys:
-  - id_ecdsa-sha2_sukaato_miniyubikey
-  - id_ecdsa-sha2_sukaato_yubikey
+  - ed25519@sukaato.hikiki
+  - ecdsa@sukaato.hikiki
 # <list<dict>> list of administrative users (in Linux, users that can use "sudo")
 admins:
   - username: senpai # <str> arbitrary valid user name
     services: ~ # <list[<str>]> if linux system user, assocated servce
     # <list[<str>]> list of control node or local SSH key basenames for this user
     ssh_keys:
-      - id_ed25519_sukaato_yubikey
-      - id_ed25519_sukaato_miniyubikey
+      - ecdsa-37851076-sk@sukaato.hikiki
+      - ecdsa-37851072-sk@sukaato.hikiki
     # <str<vault?>> hashed (and maybe salted) password
     password: !vault |
           $ANSIBLE_VAULT;1.1;AES256
@@ -47,6 +47,8 @@ admins:
           63316665653032653533656464336566626166333834653539343961666136653234356362333966
           39313436363935303430393966653762326463616264373739333638373337643666623531383064
           66353136383666626566643666663761313437396137383063373033366336663731
+# @TODO change 'key' attributes of package entres under 'mngr' section below to 'signkey' 
+# and edit 'roles/init-server/install-pks.yml' accordngly
 # <dict[<str>:<dict>]> package groups
 pkgs:
   # <dict[<str>:<dict>]> representing package groups installed by package manager via repositories