matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow setting the GPG binary path

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-19 00:42:33 -04:00
parent 5b718da664
commit a46ac1e9ef
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mayan/apps/django_gpg/runtime.py
View File

@@ -1,14 +1,4 @@
from __future__ import absolute_import
import sys
from .api import GPG from .api import GPG
from .settings import KEYSERVERS, GPG_HOME from .settings import GPG_HOME, GPG_PATH, KEYSERVERS
try: gpg = GPG(binary_path=GPG_PATH, home=GPG_HOME, keyservers=KEYSERVERS)
gpg = GPG(home=GPG_HOME, keyservers=KEYSERVERS)
except Exception as exception:
gpg = GPG(keyservers=KEYSERVERS)
# TODO: Maybe raise a standard exception to signify configuration error
sys.stderr.write(u'ERROR: GPG initialization error: %s\n' % exception)
sys.stderr.write(u'INFO: Initializating GPG with system default home\n')

1
mayan/apps/django_gpg/settings.py
View File

@@ -14,5 +14,6 @@ register_settings(
settings=[ settings=[
{'name': u'KEYSERVERS', 'global_name': u'SIGNATURES_KEYSERVERS', 'default': ['pool.sks-keyservers.net'], 'description': _(u'List of keyservers to be queried for unknown keys.')}, {'name': u'KEYSERVERS', 'global_name': u'SIGNATURES_KEYSERVERS', 'default': ['pool.sks-keyservers.net'], 'description': _(u'List of keyservers to be queried for unknown keys.')},
{'name': u'GPG_HOME', 'global_name': u'SIGNATURES_GPG_HOME', 'default': os.path.join(settings.MEDIA_ROOT, u'gpg_home'), 'description': _(u'Home directory used to store keys as well as configuration files.')}, {'name': u'GPG_HOME', 'global_name': u'SIGNATURES_GPG_HOME', 'default': os.path.join(settings.MEDIA_ROOT, u'gpg_home'), 'description': _(u'Home directory used to store keys as well as configuration files.')},
{'name': u'GPG_PATH', 'global_name': u'SIGNATURES_GPG_PATH', 'default': u'/usr/bin/gpgs', 'description': _(u'Path to the GPG binary.')},
] ]
) )