]> gitweb.fluxo.info Git - hydra.git/commitdiff
Use --batch at hydra_import_keys_openpgp
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 18 May 2018 12:07:44 +0000 (09:07 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 18 May 2018 12:07:44 +0000 (09:07 -0300)
share/hydra/import-keys

index b5953cb68edba785b04707fb3e930966a82b2874..692e5eb69fe6b3de13c9b78b62ce27c311c39276 100755 (executable)
@@ -21,6 +21,8 @@ source $APP_BASE/lib/hydra/functions || exit 1
 hydra_config_load
 
 # Import OpenPGP keypair
+# See https://superuser.com/questions/1135812/gpg2-asking-for-passphrase-when-importing-secret-keys#1135950
+#     https://dev.gnupg.org/T2313
 function hydra_import_keys_openpgp {
   key="$(keyringer $HYDRA decrypt nodes/$hostname/gpg/key 2> /dev/null | sed -ne '1,$p')"
   pubkey="$(keyringer $HYDRA decrypt nodes/$hostname/gpg/key.pub 2> /dev/null | sed -ne '1,$p')"
@@ -40,7 +42,7 @@ function hydra_import_keys_openpgp {
     echo "Importing gpg key to $node..."
     echo "-----------------------------"
     echo ""
-    echo -e "${passphrase}\n${key}" | sudo gpg --passphrase-fd 0 --no-tty --homedir /root/.gnupg --import
+    echo -e "${passphrase}\n${key}" | sudo gpg --passphrase-fd 0 --batch --no-tty --homedir /root/.gnupg --import
 
     echo ""
     echo "Trusting key $key_id at $node..."