Add SIGNATURES_GPG_HOME configuration option
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -12,3 +12,4 @@ misc/mayan.geany
|
||||
image_cache/
|
||||
build/
|
||||
_build/
|
||||
gpg_home/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
'''
|
||||
"""
|
||||
Configuration options for the django_gpg app
|
||||
'''
|
||||
"""
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
@@ -11,5 +11,6 @@ register_settings(
|
||||
module=u'django_gpg.conf.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'GPG_HOME', 'global_name': u'SIGNATURES_GPG_HOME', 'default': 'gpg_home', 'description': _(u'Home directory used to store keys as well as configuration files.')},
|
||||
]
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from django_gpg.api import GPG
|
||||
from django_gpg.conf.settings import KEYSERVERS
|
||||
from django_gpg.conf.settings import KEYSERVERS, GPG_HOME
|
||||
|
||||
gpg = GPG(keyservers=KEYSERVERS)
|
||||
gpg = GPG(home=GPG_HOME, keyservers=KEYSERVERS)
|
||||
|
||||
@@ -81,6 +81,12 @@ has been merged with compression support also added. This allows for the
|
||||
download of documents in their original format or compressed and well as
|
||||
the download of several documents in a single compressed file.
|
||||
|
||||
Customizable GPG home directory
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Addition of the SIGNATURES_GPG_HOME configuration option to let
|
||||
administrators set Mayan EDMS's GPG instance home directory, used to
|
||||
store keyrings and other GPG configuration files.
|
||||
|
||||
Upgrading
|
||||
=========
|
||||
|
||||
|
||||
@@ -412,3 +412,10 @@ Signatures
|
||||
Default: ``['pool.sks-keyservers.net']``
|
||||
|
||||
List of keyservers to be queried for unknown keys.
|
||||
|
||||
|
||||
.. data:: SIGNATURES_GPG_HOME
|
||||
|
||||
Default: ``gpg_home``
|
||||
|
||||
Home directory used to store keys as well as configuration files.
|
||||
|
||||
Reference in New Issue
Block a user