symlink gpg.conf from main config

diff --git a/.caffrc b/.caffrc
index 6240bc5e25d8a435556a2b02e14f887d432e503a..0e11f5829d1b4d5561d77299f14fbcbedf86b9a2 100644 (file)
--- a/.caffrc
+++ b/.caffrc
@@ -31,6 +31,8 @@ $CONFIG{'caffhome'}    = $ENV{'VARDIR'}.'/caff';
 # Keyserver to download keys from. Default: subkeys.pgp.net.
 $CONFIG{'keyserver'}      = 'x-hkp://pool.sks-keyservers.net';
 
 # Keyserver to download keys from. Default: subkeys.pgp.net.
 $CONFIG{'keyserver'}      = 'x-hkp://pool.sks-keyservers.net';
 

+#$CONFIG{'key-files'}      = [ $ENV{'HOME'}.'/.gnupg/pubring.gpg' ];
+

 # Boolean options, all default to false (0).
 #
 # Skip fetching the keys from the keyserver.
 # Boolean options, all default to false (0).
 #
 # Skip fetching the keys from the keyserver.

diff --git a/.var/caff/gnupghome/gpg.conf b/.var/caff/gnupghome/gpg.conf
deleted file mode 100644 (file)
index 2cff0775611460b6ff0f5accb71ca96f7f6b2d55..0000000000000000000000000000000000000000
--- a/.var/caff/gnupghome/gpg.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-charset utf-8
-no-greeting
-default-key 55c9882d999bbcc4
-#default-key 220bc883330c4a75
-lock-once
-no-auto-check-trustdb
-ask-cert-level
-default-cert-level 2
-keyid-format 0xlong
-use-agent
-export-options export-clean
-default-preference-list S9 S8 S7 S10 S4 H10 H9 H8 H11 H3 Z1 Z2 Z3
-personal-digest-preferences SHA512 SHA384 SHA256 SHA224 RIPEMD160
-personal-cipher-preferences AES256 AES192 AES TWOFISH BLOWFISH
-personal-compress-preferences ZIP ZLIB BZIP2 Uncompressed
-cert-digest-algo SHA512
-#default-keyserver-url x-hkp://pool.sks-keyservers.net
-keyserver x-hkp://pool.sks-keyservers.net
-keyserver-options honor-http-proxy
-keyserver-options auto-key-retrieve
-keyserver-options include-disabled
-keyserver-options include-revoked
-keyserver-options include-subkeys
-keyserver-options no-honor-keyserver-url
-keyserver-options honor-pka-record
-verify-options show-policy-url
-verify-options show-notations
-verify-options show-photos
-cert-policy-url http://martin-krafft.net/gpg/cert-policy/55c9882d999bbcc4/200907121833?sha512sum=f33b17c9af515bd98b2927cb453a992d3d7500e9f671966616e90510b9940895108d241648d1a0eb46b32bcbf3251a136a6ee1e2275745e11bb328c14e7e7263
-list-options show-policy-urls
-list-options show-notations
-list-options show-uid-validity
-
-# vim:tw=0:ft=gpg

diff --git a/.var/caff/gnupghome/gpg.conf b/.var/caff/gnupghome/gpg.conf
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7e826a289fb513898b92ab1e8b524ff7d84efe34
--- /dev/null
+++ b/.var/caff/gnupghome/gpg.conf
@@ -0,0 +1 @@
+../../../.gnupg/gpg.conf
\ No newline at end of file