Bob Mottram 7 years ago
parent
commit
d528d904cc
1 changed files with 6 additions and 15 deletions
  1. 6
    15
      src/freedombone-utils-gpg

+ 6
- 15
src/freedombone-utils-gpg View File

@@ -234,15 +234,9 @@ function gpg_agent_setup {
234 234
         if ! grep -q 'use-agent' /root/.gnupg/gpg.conf; then
235 235
             echo 'use-agent' >> /root/.gnupg/gpg.conf
236 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 240
         if [ -f /root/.gnupg/S.dirmngr ]; then
247 241
             rm /root/.gnupg/S.dirmngr
248 242
         fi
@@ -263,12 +257,9 @@ function gpg_agent_setup {
263 257
         if ! grep -q 'pinentry-mode loopback' /home/$gpg_username/.gnupg/gpg.conf; then
264 258
             echo 'pinentry-mode loopback' >> /home/$gpg_username/.gnupg/gpg.conf
265 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 263
         if [ -f /home/$gpg_username/.gnupg/S.dirmngr ]; then
273 264
             rm /home/$gpg_username/.gnupg/S.dirmngr
274 265
         fi