main: correct service calls

amulib/main.py

@@ -26,8 +26,6 @@ def main():
     """
     Main function of acme-updater.
     """
-    config = None
-    cert_path_provider = None
     parser = argparse.ArgumentParser()
     parser.add_argument("--apache", help="use the apache module",
                         action="store_true")
@@ -45,14 +43,14 @@ def main():
     args = parser.parse_args()
     logger = logging.getLogger("acme-updater")
     logger.addHandler(logging.StreamHandler())
-    config = read_config(args, config, logger)
+    config = read_config(args, logger)
     set_log_level(args, config, logger)
-    cert_path_provider = create_cert_path_provider(cert_path_provider, config, logger)
+    cert_path_provider = create_cert_path_provider(config, logger)
 
     execute_services(args, cert_path_provider, config)
 
 
-def read_config(args, config, logger):
+def read_config(args, logger):
     if args.config:
         try:
             with open(args.config, "r") as fobj:
@@ -78,7 +76,7 @@ def set_log_level(args, config, logger):
         logger.setLevel(logging.INFO)
 
 
-def create_cert_path_provider(cert_path_provider, config, logger):
+def create_cert_path_provider(config, logger):
     if "acme_tool" in config:
         if config["acme_tool"] == "acmetool":
             return AcmeToolCertPathProvider(config["acme_dir"])
@@ -101,19 +99,19 @@ def execute_services(args, cert_path_provider, config):
             apache.run(cert_path_provider)
     if args.postfix:
         if config:
-            postfix.run(config["postfix"], config["acme_dir"],
+            postfix.run(cert_path_provider, config["postfix"],
                         config["named_key_path"], config["dns_server"])
         else:
             postfix.run(cert_path_provider)
     if args.dovecot:
         if config:
-            dovecot.run(config["dovecot"], config["acme_dir"],
+            dovecot.run(cert_path_provider, config["dovecot"],
                         config["named_key_path"], config["dns_server"])
         else:
             dovecot.run(cert_path_provider)
     if args.ejabberd:
         if config:
-            ejabberd.run(config["ejabberd"], config["acme_dir"],
+            ejabberd.run(cert_path_provider, config["ejabberd"],
                          config["dns_server"])
         else:
             ejabberd.run(cert_path_provider)