From f41e4d7c650a74c2b6bdf5d4d49d8767dc043c02 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 22 Apr 2021 13:38:28 -0500
Subject: [PATCH 1/3] just load the key from the repo to avoid apt-key issues

---
 scripts/ansible          |  12 +++++++-----
 scripts/iiab-ansible.gpg | Bin 0 -> 1168 bytes
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 scripts/iiab-ansible.gpg

diff --git a/scripts/ansible b/scripts/ansible
index 0aa812e25..573db1be4 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -92,10 +92,12 @@ if [ ! -f /etc/debian_version ]; then    # e.g. RaspiOS, Ubuntu, Mint & Debian
     exit 1
 fi
 
-echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n"
+echo -e "\napt update; install keys for PPA used in /etc/apt/sources.list.d/iiab-ansible.list\n"
 $APT_PATH/apt update
-$APT_PATH/apt -y install dirmngr
-echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
+#$APT_PATH/apt -y install dirmngr
+
+# JV just manually install the key to new location 2021-04-22
+echo "deb [signed-by=/opt/iiab/iiab/scripts/iiab-ansible.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
      > /etc/apt/sources.list.d/iiab-ansible.list
 # In future we might instead consider 'add-apt-repository ppa:ansible/ansible'
 # or 'apt-add-repository ppa:ansible/bionic/ansible' etc, e.g. for streamlined
@@ -110,8 +112,8 @@ echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
 #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu disco main" \
     #    > /etc/apt/sources.list.d/iiab-ansible.list
 
-echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
+#echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
+#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
 echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu '$CODENAME' main"'
 echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
 echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
diff --git a/scripts/iiab-ansible.gpg b/scripts/iiab-ansible.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..d6f75bbc5220a72db80c70fa663d934d9f57f635
GIT binary patch
literal 1168
zcmV;B1aJG90u2OHmu)Zs5CF<8#y2sBavX?)67L*C?G(=zXq7e@f6Q6auif(;)LZod
zJu=nD{xl;si4m1N>|mHxbs=?y#0s%cDFcoXWGuiOPPcBqgGtD(O&)chTnV3O_vTKp
zpxjBtjm2l2l)Co$f!&#ZUZx+mr|if+XiX)imRGOaN{wFzF5qf*MMMWR-!r_9)GT8n
z9-skmj@@r=PeO_JMTAEoMON^=mLX&{p9PrVXI@k~>Eol0;1Wto(EAo0j!ob9JLZv$
zz{J9ga|)i0iWfLtD7Lfx2pcwfa@C_G1M<jC<vKnHI*O_vttK}Y9``UH8}LCgw)B<%
zu5ixMvwIQa8H{0@oS>jY`Lz6(awYWneCUowKp!;(c|LRENDJuV@}J^R10+K>bBPj0
zCcgwPd7G4u#uSnVISiLz>kj2k1P55=&JfyHmd(KqdSL^A$;r(RK;Xi~)S07(S1`Hx
zluz`k@CoV<@SfH`dGGH;tTOf>%sFH)iWJCW^83^D=M##Vb)#E2kuO`HOHZMJPPY`)
z#rAzJVN>~#YhaCw6qRIee66;(wewmmFwLqf<Z~NVuOSw9NFoP3)Jx+bw-`s8zSx5k
zRm&k~@wMCApVs)AzE<^?$6|xsoD~m#*Yg4aM73znf%J@ZR_-#Bo&B@;K7|O+sa9FM
z&0TJ#cE@ejk*fd^0RRE83;+OUaAyGk000000JI-WVRdd}XmDX<AW%?2AZBlJAVF?(
zX<}?;EFej4V=k}^003ujX955K00000i2^tT69EDMA_W3dmu)Zt8v_Ol2?z%R0tOWb
z0tpHW1Qr4V0RkQY0vCV)3JDOC#H0Otxx;4+-4FkA7O%Ia((+jSNjG#?vh>I#xM7Uy
zj4+Unp~Z9?dnFy^Ep&k9z1@*%FAsQAQg_q^ZA|2Ax<Os%H*2{d5n3y^Ex-B3Qlv#k
zPj09IvS*-v#MObKi^kiYPfMuah5mBsYQZWzs;yTw^ZN0D>}@E=%BDtciOPD+c(7l!
zho;1z9^v?+=mW{bPK7@|z`h3!+#5lH>mC;eAZw{ca%yxWx*r-8+j=+B_0_#@aD^lr
zQGYcRci@}xrY_B1bATdXsNhK*{R`_5@Snvl%@^X(#j_I0E(`LpP@0t-%adrgYf0nv
z{mkf^m#uEZhfVP0mH+ABM$$9YYGhc7uU_zbLfwi01ixZuFJvRqgLiooRMNo7-bQbS
znxUT8je#Ug{poZ{T)y9ck!Lmb=J$T2<lw-rl@}fGy=Us5dQ~+)KuFf5hKL1T;8@z}
z7$vBbO#2c?kBS~3_jrg_$*h4G|At2Ko8{F)+u1k@GVegoWg#h<uDnK=!Khc%wRRrt
ziIxNjrB>2%i1(LzY!TWhePHBrdo)WGPY3)h7C#hPORz)L!-36Ks;a^piJc|8(PTGn
zSad{%|NB2-0#?2=Ng~I(^p!6?WEWF|1MY|_<UJZ_#w|K(AJFS-kKL1a`PZ=4z*%*m
iy^*4wIOUV53e}yX&TR-3P?2F{+!U~|1^@$RaAyEnlq7Zl

literal 0
HcmV?d00001


From 9d12ad09ac0481e8d3326985c73254269ed488f3 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 22 Apr 2021 19:46:37 -0500
Subject: [PATCH 2/3] save an apt update

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 573db1be4..10cbabe31 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -93,7 +93,7 @@ if [ ! -f /etc/debian_version ]; then    # e.g. RaspiOS, Ubuntu, Mint & Debian
 fi
 
 echo -e "\napt update; install keys for PPA used in /etc/apt/sources.list.d/iiab-ansible.list\n"
-$APT_PATH/apt update
+#$APT_PATH/apt update
 #$APT_PATH/apt -y install dirmngr
 
 # JV just manually install the key to new location 2021-04-22

From a401b3890748907c5679db976e7ca312b2eafb14 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Fri, 23 Apr 2021 03:11:09 -0500
Subject: [PATCH 3/3] touch up notes

---
 scripts/ansible | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 10cbabe31..d1f049cd8 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -92,11 +92,11 @@ if [ ! -f /etc/debian_version ]; then    # e.g. RaspiOS, Ubuntu, Mint & Debian
     exit 1
 fi
 
-echo -e "\napt update; install keys for PPA used in /etc/apt/sources.list.d/iiab-ansible.list\n"
+# JV just manually use the key from this repo 2021-04-22
+echo -e "\napt update; use local keys for PPA in /etc/apt/sources.list.d/iiab-ansible.list\n"
 #$APT_PATH/apt update
 #$APT_PATH/apt -y install dirmngr
 
-# JV just manually install the key to new location 2021-04-22
 echo "deb [signed-by=/opt/iiab/iiab/scripts/iiab-ansible.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu $CODENAME main" \
      > /etc/apt/sources.list.d/iiab-ansible.list
 # In future we might instead consider 'add-apt-repository ppa:ansible/ansible'
@@ -112,6 +112,7 @@ echo "deb [signed-by=/opt/iiab/iiab/scripts/iiab-ansible.gpg] http://ppa.launchp
 #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu disco main" \
     #    > /etc/apt/sources.list.d/iiab-ansible.list
 
+# JV 2021-04-22
 #echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
 #apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
 echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu '$CODENAME' main"'