Remove non-customizable pki_source_emails param

dogtagpki · Jul 12, 2023 · 400850a · 400850a
1 parent 8fd8268
commit 400850a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
@@ -403,12 +403,6 @@ pki_master_crl_enable=True
 # based on the CMS hostname and port.
 pki_default_ocsp_uri=
 
-# Paths
-# These are used in the processing of pkispawn and are not supposed
-# to be overwritten by user configuration files.
-#
-pki_source_emails=/usr/share/pki/ca/emails
-
 pki_serial_number_range_start=
 pki_serial_number_range_end=
 pki_request_number_range_start=

diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
@@ -95,12 +95,19 @@ def spawn(self, deployer):
 
             # Copy /usr/share/pki/ca/emails
             # to /etc/pki/<instance>/ca/emails
+
+            pki_source_emails = os.path.join(
+                pki.server.PKIServer.SHARE_DIR,
+                subsystem_name,
+                'emails')
+
             instance.copy(
-                deployer.mdict['pki_source_emails'],
+                pki_source_emails,
                 subsystem.conf_dir + '/emails')
 
             # Link /var/lib/pki/<instance>/ca/emails
             # to /etc/pki/<instance>/ca/emails
+
             emails_path = os.path.join(instance.conf_dir, 'ca', 'emails')
             emails_link = os.path.join(instance.base_dir, 'ca', 'emails')
             instance.symlink(emails_path, emails_link, exist_ok=True)