|
@@ -1396,6 +1396,9 @@ function configure_gpg {
|
1396
|
1396
|
|
1397
|
1397
|
sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
|
1398
|
1398
|
|
|
1399
|
+ gpg_agent_setup root
|
|
1400
|
+ gpg_agent_setup $MY_USERNAME
|
|
1401
|
+
|
1399
|
1402
|
if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
|
1400
|
1403
|
echo '' >> $gpg_dir/gpg.conf
|
1401
|
1404
|
echo '# default preferences' >> $gpg_dir/gpg.conf
|
|
@@ -1456,8 +1459,6 @@ function configure_gpg {
|
1456
|
1459
|
chmod 700 /root/.gnupg
|
1457
|
1460
|
chmod 600 /root/.gnupg/*
|
1458
|
1461
|
fi
|
1459
|
|
- gpg_agent_setup root
|
1460
|
|
- gpg_agent_setup $MY_USERNAME
|
1461
|
1462
|
|
1462
|
1463
|
mark_completed $FUNCNAME
|
1463
|
1464
|
}
|