From 75f597ac365f8548b6737ed506fb384d9bcf2ffb Mon Sep 17 00:00:00 2001
From: Kishi85 <git@eightyfive.net>
Date: Thu, 28 Mar 2019 09:06:21 +0100
Subject: [PATCH] configuration: put all authority related directives into
 sub-dict

---
 acertmgr/__init__.py      |  4 ++--
 acertmgr/configuration.py | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/acertmgr/__init__.py b/acertmgr/__init__.py
index 7e03004..9b3bbf0 100755
--- a/acertmgr/__init__.py
+++ b/acertmgr/__init__.py
@@ -52,7 +52,7 @@ def create_challenge_handler(settings):
 def cert_get(settings):
     print("Getting certificate for '%s'." % settings['domains'])
 
-    acme = create_authority(settings)
+    acme = create_authority(settings['authority'])
     acme.register_account()
 
     # create challenge handlers for this certificate
@@ -147,7 +147,7 @@ def cert_revoke(cert, configs, reason=None):
     domains = set(tools.get_cert_domains(cert))
     for config in configs:
         if domains == set(config['domainlist']):
-            acme = create_authority(config)
+            acme = create_authority(config['authority'])
             acme.register_account()
             acme.revoke_crt(cert, reason)
             return
diff --git a/acertmgr/configuration.py b/acertmgr/configuration.py
index 5de8973..a00f3d5 100644
--- a/acertmgr/configuration.py
+++ b/acertmgr/configuration.py
@@ -99,21 +99,24 @@ def parse_config_entry(entry, globalconfig, runtimeconfig):
     # Action config defaults
     config['defaults'] = globalconfig.get('defaults', {})
 
-    # API version
-    update_config_value(config, 'api', localconfig, globalconfig, DEFAULT_API)
+    # Authority related config options
+    config['authority'] = {}
 
-    # Certificate authority
-    update_config_value(config, 'authority', localconfig, globalconfig, DEFAULT_AUTHORITY)
+    # - API version
+    update_config_value(config['authority'], 'api', localconfig, globalconfig, DEFAULT_API)
 
-    # Certificate authority ToS agreement
-    update_config_value(config, 'authority_tos_agreement', localconfig, globalconfig,
+    # - Certificate authority
+    update_config_value(config['authority'], 'authority', localconfig, globalconfig, DEFAULT_AUTHORITY)
+
+    # - Certificate authority ToS agreement
+    update_config_value(config['authority'], 'authority_tos_agreement', localconfig, globalconfig,
                         runtimeconfig['authority_tos_agreement'])
 
-    # Certificate authority contact email addresses
-    update_config_value(config, 'authority_contact_email', localconfig, globalconfig, None)
+    # - Certificate authority contact email addresses
+    update_config_value(config['authority'], 'authority_contact_email', localconfig, globalconfig, None)
 
-    # Account key
-    update_config_value(config, 'account_key', localconfig, globalconfig,
+    # - Account key path
+    update_config_value(config['authority'], 'account_key', localconfig, globalconfig,
                         os.path.join(runtimeconfig['work_dir'], "account.key"))
 
     # Certificate directory