| 1 |
commit: ae27c95d72d9860fe4da8b261d3d66beb97a3184 |
| 2 |
Author: aeroniero33 <justthisthing <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 27 14:04:09 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 24 04:54:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=ae27c95d |
| 7 |
|
| 8 |
Created email.conf and setup the config files needed for the email reminders |
| 9 |
|
| 10 |
Added a template_path and a commented days limit value in `gkeys.conf`. |
| 11 |
Added a 30 default value for the days limit in `config.py`. |
| 12 |
I also added another config file called `email.conf` that includes the 2 templates |
| 13 |
for email users' credentials and a preferred address ending |
| 14 |
with the default being `@gentoo` which if enabled will only send emails to these addresses. |
| 15 |
|
| 16 |
gkeys/etc/gkeys.conf | 4 ++++ |
| 17 |
gkeys/gkeys/base.py | 7 ++++++- |
| 18 |
gkeys/gkeys/config.py | 5 +++-- |
| 19 |
3 files changed, 13 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf |
| 22 |
index e9eb820..392df74 100644 |
| 23 |
--- a/gkeys/etc/gkeys.conf |
| 24 |
+++ b/gkeys/etc/gkeys.conf |
| 25 |
@@ -6,6 +6,8 @@ |
| 26 |
# keyserver: server to use to obtain the keys from |
| 27 |
keyserver: pool.sks-keyservers.net |
| 28 |
|
| 29 |
+#Days limit for keys nearing expiry |
| 30 |
+#days_limit = 30 |
| 31 |
|
| 32 |
# gkeysdir: Base directory to use as the path prefix to use |
| 33 |
# for the gkey directories, keyring settings |
| 34 |
@@ -24,6 +26,8 @@ gkeysdir: /var/lib/gentoo/gkeys |
| 35 |
# user gkey directory |
| 36 |
user-dir = %(homedir)s/gkeys-user |
| 37 |
|
| 38 |
+#Template directory |
| 39 |
+template_path = /usr/share/gkeys/templates |
| 40 |
|
| 41 |
# base keyring dir |
| 42 |
keyring: %(gkeysdir)s/keyrings |
| 43 |
|
| 44 |
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py |
| 45 |
index dbe6642..9b285e4 100644 |
| 46 |
--- a/gkeys/gkeys/base.py |
| 47 |
+++ b/gkeys/gkeys/base.py |
| 48 |
@@ -296,7 +296,12 @@ class CliBase(object): |
| 49 |
args = self.parse_args(args) |
| 50 |
if args.config: |
| 51 |
self.config.defaults['config'] = args.config |
| 52 |
- self.config.read_config() |
| 53 |
+ self.config.defaults['configdir'] = os.path.dirname(args.config) |
| 54 |
+ if args.email: |
| 55 |
+ configs = [self.config.defaults['config'], os.path.abspath(os.path.join(self.config.defaults['configdir'], "email.conf"))] |
| 56 |
+ self.config.read_config(configs) |
| 57 |
+ else: |
| 58 |
+ self.config.read_config() |
| 59 |
else: |
| 60 |
self.config.read_config(configs) |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py |
| 64 |
index ee667ec..3828189 100644 |
| 65 |
--- a/gkeys/gkeys/config.py |
| 66 |
+++ b/gkeys/gkeys/config.py |
| 67 |
@@ -59,6 +59,7 @@ class GKeysConfig(GPGConfig): |
| 68 |
self.defaults['configdir'] = self.defaults['userconfigdir'] |
| 69 |
self.defaults['config']= os.path.join( |
| 70 |
self.defaults['userconfigdir'], 'gkeys.conf') |
| 71 |
+ self.defaults['template_path'] = '/usr/share/gkeys/templates' |
| 72 |
if not os.path.exists(self.defaults['config']): |
| 73 |
self.defaults['configdir'] = path([self.root, EPREFIX, '/etc/gkeys']) |
| 74 |
self.defaults['config'] = '%(configdir)s/gkeys.conf' |
| 75 |
@@ -85,6 +86,7 @@ class GKeysConfig(GPGConfig): |
| 76 |
self.defaults['verify-keyring'] = 'gentoo' |
| 77 |
self.defaults['verify-nick'] = 'gkeys' |
| 78 |
self.defaults['verify-seeds'] = {} |
| 79 |
+ self.defaults['days_limit'] = 30 |
| 80 |
|
| 81 |
|
| 82 |
def read_config(self, filename=None): |
| 83 |
@@ -98,7 +100,7 @@ class GKeysConfig(GPGConfig): |
| 84 |
self.defaults[key] = self._sub_(self.defaults[key]) |
| 85 |
defaults = OrderedDict() |
| 86 |
# Add only the defaults we want in the configparser |
| 87 |
- for key in ['gkeysdir', 'homedir', 'keyring', 'sign-keydir', 'logdir', |
| 88 |
+ for key in ['userconfigdir', 'gkeysdir', 'homedir', 'keyring', 'sign-keydir', 'logdir', |
| 89 |
'seedsdir', 'keyserver']: |
| 90 |
defaults[key] = self.defaults[key] |
| 91 |
if filename == None: |
| 92 |
@@ -137,4 +139,3 @@ class GKeysConfig(GPGConfig): |
| 93 |
return super(GKeysConfig, self)._get_(key, subkey) |
| 94 |
else: |
| 95 |
return super(GKeysConfig, self)._get_(key, subkey) |
| 96 |
- |
Archives