Replace default_deployment_cfg with DEFAULT_DEPLOYMENT_CFG

dogtagpki · Sep 25, 2024 · dc14e3e · dc14e3e
1 parent fe6567d
commit dc14e3e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/base/server/python/pki/server/deployment/pkiconfig.py b/base/server/python/pki/server/deployment/pkiconfig.py
@@ -62,12 +62,9 @@
 #        should always match the 'default' instance name specified below).
 PKI_DEPLOYMENT_DEFAULT_TOMCAT_INSTANCE_NAME = "pki-tomcat"
 
-DEFAULT_DEPLOYMENT_CONFIGURATION = "default.cfg"
+DEFAULT_DEPLOYMENT_CFG = PKI_DEPLOYMENT_SOURCE_ROOT + '/server/etc/default.cfg'
 USER_DEPLOYMENT_CONFIGURATION = "deployment.cfg"
 
-PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE = \
-    PKI_DEPLOYMENT_SOURCE_ROOT + "/server/etc/" + DEFAULT_DEPLOYMENT_CONFIGURATION
-
 # subtypes of PKI subsystems
 PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM = "Cloned"
 PKI_DEPLOYMENT_EXTERNAL_CA = "External"
@@ -83,7 +80,6 @@
 pki_deployment_executable = None
 
 #     'pkispawn' ONLY
-default_deployment_cfg = None
 user_deployment_cfg = None
 #     'pkidestroy' ONLY
 pki_deployed_instance_name = None

diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
@@ -331,15 +331,6 @@ def process_command_line_arguments(self):
         return args
 
     def validate(self, user_deployment_cfg):
-        # always default that configuration file exists
-        if not os.path.exists(config.default_deployment_cfg) or \
-                not os.path.isfile(config.default_deployment_cfg):
-            logger.error(
-                log.PKI_FILE_MISSING_OR_NOT_A_FILE_1,
-                config.default_deployment_cfg)
-            self.arg_parser.print_help()
-            self.arg_parser.exit(-1)
-
         if user_deployment_cfg:
             # verify user configuration file exists
             if not os.path.exists(user_deployment_cfg) or \
@@ -403,7 +394,7 @@ def init_config(self, pki_instance_name=None):
         self.deployer.user_config = configparser.ConfigParser()
         self.deployer.user_config.optionxform = str
 
-        with open(config.default_deployment_cfg, encoding='utf-8') as f:
+        with open(config.DEFAULT_DEPLOYMENT_CFG, encoding='utf-8') as f:
             if six.PY2:
                 self.deployer.main_config.readfp(f)
             else:

diff --git a/base/server/python/pki/server/pkidestroy.py b/base/server/python/pki/server/pkidestroy.py
@@ -193,9 +193,6 @@ def main(argv):
                      deployer.subsystem_type, instance_name)
         sys.exit(1)
 
-    config.default_deployment_cfg = \
-        config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE
-
     # establish complete path to previously deployed configuration file
     config.user_deployment_cfg = os.path.join(
         subsystem.base_dir,

diff --git a/base/server/python/pki/server/pkispawn.py b/base/server/python/pki/server/pkispawn.py
@@ -159,9 +159,6 @@ def main(argv):
 
     args = parser.process_command_line_arguments()
 
-    config.default_deployment_cfg = \
-        config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE
-
     # -f <user deployment config>
     if args.user_deployment_cfg is not None:
         config.user_deployment_cfg = str(