Bob Mottram 7 年之前
父節點
當前提交
d528d904cc
共有 1 個檔案被更改,包括 6 行新增15 行删除
  1. 6
    15
      src/freedombone-utils-gpg

+ 6
- 15
src/freedombone-utils-gpg 查看文件

234
         if ! grep -q 'use-agent' /root/.gnupg/gpg.conf; then
234
         if ! grep -q 'use-agent' /root/.gnupg/gpg.conf; then
235
             echo 'use-agent' >> /root/.gnupg/gpg.conf
235
             echo 'use-agent' >> /root/.gnupg/gpg.conf
236
         fi
236
         fi
237
-        if ! grep -q 'pinentry-mode loopback' /root/.gnupg/gpg.conf; then
238
-            echo 'pinentry-mode loopback' >> /root/.gnupg/gpg.conf
239
-        fi
240
-        if [ ! -f /root/.gnupg/gpg-agent.conf ]; then
241
-            touch /root/.gnupg/gpg-agent.conf
242
-        fi
243
-        if ! grep -q 'allow-loopback-pinentry' /root/.gnupg/gpg-agent.conf; then
244
-            echo 'allow-loopback-pinentry' >> /root/.gnupg/gpg-agent.conf
245
-        fi
237
+        echo 'default-cache-ttl 300' > /root/.gnupg/gpg-agent.conf
238
+        echo 'max-cache-ttl 999999' >> /root/.gnupg/gpg-agent.conf
239
+        echo 'allow-loopback-pinentry' >> /root/.gnupg/gpg-agent.conf
246
         if [ -f /root/.gnupg/S.dirmngr ]; then
240
         if [ -f /root/.gnupg/S.dirmngr ]; then
247
             rm /root/.gnupg/S.dirmngr
241
             rm /root/.gnupg/S.dirmngr
248
         fi
242
         fi
263
         if ! grep -q 'pinentry-mode loopback' /home/$gpg_username/.gnupg/gpg.conf; then
257
         if ! grep -q 'pinentry-mode loopback' /home/$gpg_username/.gnupg/gpg.conf; then
264
             echo 'pinentry-mode loopback' >> /home/$gpg_username/.gnupg/gpg.conf
258
             echo 'pinentry-mode loopback' >> /home/$gpg_username/.gnupg/gpg.conf
265
         fi
259
         fi
266
-        if [ ! -f /home/$gpg_username/.gnupg/gpg-agent.conf ]; then
267
-            touch /home/$gpg_username/.gnupg/gpg-agent.conf
268
-        fi
269
-        if ! grep -q 'allow-loopback-pinentry' /home/$gpg_username/.gnupg/gpg-agent.conf; then
270
-            echo 'allow-loopback-pinentry' >> /home/$gpg_username/.gnupg/gpg-agent.conf
271
-        fi
260
+        echo 'default-cache-ttl 300' > /home/$gpg_username/.gnupg/gpg-agent.conf
261
+        echo 'max-cache-ttl 999999' >> /home/$gpg_username/.gnupg/gpg-agent.conf
262
+        echo 'allow-loopback-pinentry' >> /home/$gpg_username/.gnupg/gpg-agent.conf
272
         if [ -f /home/$gpg_username/.gnupg/S.dirmngr ]; then
263
         if [ -f /home/$gpg_username/.gnupg/S.dirmngr ]; then
273
             rm /home/$gpg_username/.gnupg/S.dirmngr
264
             rm /home/$gpg_username/.gnupg/S.dirmngr
274
         fi
265
         fi