commit: 14adf2bd698e73ec77ce20fb910306a18064546e
Author: aeroniero33 <justthisthing <AT> gmail <DOT> com>
AuthorDate: Sat Aug 27 14:04:09 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 19:40:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=14adf2bd
Created email.conf and setup the config files needed for the email reminders
Added a template_path and a commented days limit value in `gkeys.conf`.
Added a 30 default value for the days limit in `config.py`.
I also added another config file called `email.conf` that includes the 2
templates
for email users' credentials and a preferred address ending
with the default being `@gentoo` which if enabled will only send emails to
these addresses.
gkeys/etc/gkeys.conf | 4 ++++
gkeys/gkeys/base.py | 7 ++++++-
gkeys/gkeys/config.py | 5 +++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index e9eb820..392df74 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -6,6 +6,8 @@
# keyserver: server to use to obtain the keys from
keyserver: pool.sks-keyservers.net
+#Days limit for keys nearing expiry
+#days_limit = 30
# gkeysdir: Base directory to use as the path prefix to use
# for the gkey directories, keyring settings
@@ -24,6 +26,8 @@ gkeysdir: /var/lib/gentoo/gkeys
# user gkey directory
user-dir = %(homedir)s/gkeys-user
+#Template directory
+template_path = /usr/share/gkeys/templates
# base keyring dir
keyring: %(gkeysdir)s/keyrings
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index dbe6642..9b285e4 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -296,7 +296,12 @@ class CliBase(object):
args = self.parse_args(args)
if args.config:
self.config.defaults['config'] = args.config
- self.config.read_config()
+ self.config.defaults['configdir'] = os.path.dirname(args.config)
+ if args.email:
+ configs = [self.config.defaults['config'],
os.path.abspath(os.path.join(self.config.defaults['configdir'], "email.conf"))]
+ self.config.read_config(configs)
+ else:
+ self.config.read_config()
else:
self.config.read_config(configs)
diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py
index ee667ec..3828189 100644
--- a/gkeys/gkeys/config.py
+++ b/gkeys/gkeys/config.py
@@ -59,6 +59,7 @@ class GKeysConfig(GPGConfig):
self.defaults['configdir'] = self.defaults['userconfigdir']
self.defaults['config']= os.path.join(
self.defaults['userconfigdir'], 'gkeys.conf')
+ self.defaults['template_path'] = '/usr/share/gkeys/templates'
if not os.path.exists(self.defaults['config']):
self.defaults['configdir'] = path([self.root, EPREFIX,
'/etc/gkeys'])
self.defaults['config'] = '%(configdir)s/gkeys.conf'
@@ -85,6 +86,7 @@ class GKeysConfig(GPGConfig):
self.defaults['verify-keyring'] = 'gentoo'
self.defaults['verify-nick'] = 'gkeys'
self.defaults['verify-seeds'] = {}
+ self.defaults['days_limit'] = 30
def read_config(self, filename=None):
@@ -98,7 +100,7 @@ class GKeysConfig(GPGConfig):
self.defaults[key] = self._sub_(self.defaults[key])
defaults = OrderedDict()
# Add only the defaults we want in the configparser
- for key in ['gkeysdir', 'homedir', 'keyring', 'sign-keydir', 'logdir',
+ for key in ['userconfigdir', 'gkeysdir', 'homedir', 'keyring',
'sign-keydir', 'logdir',
'seedsdir', 'keyserver']:
defaults[key] = self.defaults[key]
if filename == None:
@@ -137,4 +139,3 @@ class GKeysConfig(GPGConfig):
return super(GKeysConfig, self)._get_(key, subkey)
else:
return super(GKeysConfig, self)._get_(key, subkey)
-
