CLI: Update

This commit is contained in:
Christer Warén committed 2026-10-03 11:53:13 +03:00
1 parent e96397a9e8
commit 9162f35675
1 file changed
+7 -7
+7 -7
View File
@@ -1030,7 +1030,7 @@ pxi-eas-data-decrypt(){
do do
i=$((i + 1)) i=$((i + 1))
echo "$i)${file#"$PWD/eas/data/$SERIAL/"}" echo "$i)${file#"$PWD/eas/data/$SERIAL/"}"
ansible-vault decrypt --vault-id "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file" ansible-vault decrypt --vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file"
done done
fi fi
else else
@@ -1050,7 +1050,7 @@ pxi-eas-data-deliver(){
playbook=cli playbook=cli
tasks=eas-data-deliver tasks=eas-data-deliver
limit="${args['limit']:-all}" limit="${args['limit']:-all}"
vaulted=(--vault-id "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL)@~/.pories/credentials/ansible-vault/eas/$SERIAL") vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@~/.warengroup/credentials/ansible-vault/eas/$SERIAL")
/opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}" /opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}"
cd "$OLDPWD" cd "$OLDPWD"
@@ -1069,7 +1069,7 @@ pxi-eas-data-encrypt(){
do do
i=$((i + 1)) i=$((i + 1))
echo "$i)${file#"$PWD/eas/data/$SERIAL/"}" echo "$i)${file#"$PWD/eas/data/$SERIAL/"}"
ansible-vault encrypt --vault-id "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file" ansible-vault encrypt --vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)"@"$LOCATION/ansible-vault/eas/$SERIAL" "$file"
done done
fi fi
} }
@@ -1086,7 +1086,7 @@ pxi-eas-data-retrieve(){
playbook=cli playbook=cli
tasks=eas-data-retrieve tasks=eas-data-retrieve
limit="${args['limit']:-all}" limit="${args['limit']:-all}"
vaulted=(--vault-id "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL)@~/.pories/credentials/ansible-vault/eas/$SERIAL") vaulted=(--vault-id "Warén Group - Infra - Emergency Access System ($SERIAL)@~/.warengroup/credentials/ansible-vault/eas/$SERIAL")
/opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}" /opt/ansible/bin/ansible-playbook $playbook.yml -t "$tasks" --limit "$limit,localhost" --extra-vars "${args['vars']}" "${vaulted[@]}"
cd "$OLDPWD" cd "$OLDPWD"
@@ -1120,7 +1120,7 @@ wxi-eas-token-create(){
EAS_AVP=$(ykman piv objects export 0x005FFF16 - 2>/dev/null) EAS_AVP=$(ykman piv objects export 0x005FFF16 - 2>/dev/null)
if [[ $EAS_AVP != "" ]] if [[ $EAS_AVP != "" ]]
then then
echo -e "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL) / Ansible Vault / $EAS_AVP" > "$LOCATION/ansible-vault/eas/$SERIAL" echo -e "Warén Group - Infra - Emergency Access System ($SERIAL) / Ansible Vault / $EAS_AVP" > "$LOCATION/ansible-vault/eas/$SERIAL"
if [[ -f "$LOCATION/ansible-vault/eas/$SERIAL" && $(base64 "$LOCATION/ansible-vault/eas/$SERIAL") != "" ]] if [[ -f "$LOCATION/ansible-vault/eas/$SERIAL" && $(base64 "$LOCATION/ansible-vault/eas/$SERIAL") != "" ]]
then then
wxi-content text "Ready ✔" wxi-content text "Ready ✔"
@@ -1156,7 +1156,7 @@ wxi-eas-token-create(){
mv "id_ed25519_sk_rk_warengroup-infra-eas-$SERIAL" "$SERIAL" mv "id_ed25519_sk_rk_warengroup-infra-eas-$SERIAL" "$SERIAL"
mv "id_ed25519_sk_rk_warengroup-infra-eas-$SERIAL.pub" "$SERIAL.pub" mv "id_ed25519_sk_rk_warengroup-infra-eas-$SERIAL.pub" "$SERIAL.pub"
ssh-keygen -c -f "$LOCATION/ssh/eas/$SERIAL" -P "" -C "Pori Entrepreneurship Society - Infra - Emergency Access System ($SERIAL)" &> /dev/null ssh-keygen -c -f "$LOCATION/ssh/eas/$SERIAL" -P "" -C "Warén Group - Infra - Emergency Access System ($SERIAL)" &> /dev/null
wxi-content text* "Retrieving: " wxi-content text* "Retrieving: "
wxi-content text "Ready ✔" wxi-content text "Ready ✔"
@@ -1254,7 +1254,7 @@ wxi-eas-token-sign-gen(){
then then
if [[ ! -f "$LOCATION/ssh/eas/$SERIAL-" ]] if [[ ! -f "$LOCATION/ssh/eas/$SERIAL-" ]]
then then
pxi-ssh-keys-generate "eas/$SERIAL-" "Warén Group - Infra - Emergency Access System ($SERIAL)" &> /dev/null wxi-ssh-keys-generate "eas/$SERIAL-" "Warén Group - Infra - Emergency Access System ($SERIAL)" &> /dev/null
fi fi
ssh-keygen -s "$LOCATION/ssh/eas/$SERIAL" -I "Warén Group - Infra - Emergency Access System ($SERIAL)" -n root -V -1m:+30m "$LOCATION/ssh/eas/$SERIAL-.pub" ssh-keygen -s "$LOCATION/ssh/eas/$SERIAL" -I "Warén Group - Infra - Emergency Access System ($SERIAL)" -n root -V -1m:+30m "$LOCATION/ssh/eas/$SERIAL-.pub"