From f10a99ec9f9a4a0fab9111997441b89ad9bb14bf Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 14 Jul 2023 17:47:53 -0500 Subject: [PATCH] Remove non-configurable pki_source_subsystem_path param --- base/server/etc/default.cfg | 1 - base/tps/shared/conf/CS.cfg | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 775c99b2100..5e2e3c52b41 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -209,7 +209,6 @@ pki_client_password_conf=%(pki_client_subsystem_dir)s/password.conf pki_client_pkcs12_password_conf=%(pki_client_subsystem_dir)s/pkcs12_password.conf pki_client_admin_cert=%(pki_client_dir)s/%(pki_subsystem_type)s_admin.cert -pki_source_subsystem_path=/usr/share/pki/%(pki_subsystem_type)s pki_instance_path=/var/lib/pki/%(pki_instance_name)s pki_instance_configuration_path=/etc/pki/%(pki_instance_name)s diff --git a/base/tps/shared/conf/CS.cfg b/base/tps/shared/conf/CS.cfg index 894f76c3b96..21491eab178 100644 --- a/base/tps/shared/conf/CS.cfg +++ b/base/tps/shared/conf/CS.cfg @@ -1456,7 +1456,7 @@ op.enroll.soKeyTemporary.pkcs11obj.enable=true op.enroll.soKeyTemporary.tks.conn=tks1 op.enroll.soKeyTemporary.tks.keySet=defKeySet op.enroll.soKey.temporaryToken.tokenType=soKeyTemporary -op.enroll.soKeyTemporary.update.applet.directory=[pki_source_subsystem_path]/applets +op.enroll.soKeyTemporary.update.applet.directory=/usr/share/pki/tps/applets op.enroll.soKeyTemporary.update.applet.emptyToken.enable=true op.enroll.soKeyTemporary.update.applet.enable=true op.enroll.soKeyTemporary.update.applet.encryption=true @@ -1464,7 +1464,7 @@ op.enroll.soKeyTemporary.update.applet.requiredVersion=1.4.58768072 op.enroll.soKeyTemporary.update.symmetricKeys.enable=false op.enroll.soKeyTemporary.update.symmetricKeys.requiredVersion=1 op.enroll.soKey.tks.conn=tks1 -op.enroll.soKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.enroll.soKey.update.applet.directory=/usr/share/pki/tps/applets op.enroll.soKey.update.applet.emptyToken.enable=true op.enroll.soKey.update.applet.enable=true op.enroll.soKey.update.applet.encryption=true @@ -1798,7 +1798,7 @@ op.enroll.userKeyTemporary.maximumGPKeyVersion=FF op.enroll.userKeyTemporary.rollbackKeyVersionOnPutKeyFailure=false op.enroll.userKeyTemporary.validateCardKeyInfoAgainstTokenDB=true op.enroll.userKey.temporaryToken.tokenType=userKeyTemporary -op.enroll.userKeyTemporary.update.applet.directory=[pki_source_subsystem_path]/applets +op.enroll.userKeyTemporary.update.applet.directory=/usr/share/pki/tps/applets op.enroll.userKeyTemporary.update.applet.emptyToken.enable=true op.enroll.userKeyTemporary.update.applet.enable=true op.enroll.userKeyTemporary.update.applet.encryption=true @@ -1806,7 +1806,7 @@ op.enroll.userKeyTemporary.update.applet.requiredVersion=1.4.58768072 op.enroll.userKeyTemporary.update.symmetricKeys.enable=false op.enroll.userKeyTemporary.update.symmetricKeys.requiredVersion=1 op.enroll.userKey.tks.conn=tks1 -op.enroll.userKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.enroll.userKey.update.applet.directory=/usr/share/pki/tps/applets op.enroll.userKey.update.applet.emptyToken.enable=true op.enroll.userKey.update.applet.enable=true op.enroll.userKey.update.applet.encryption=true @@ -1831,7 +1831,7 @@ op.format.cleanToken.loginRequest.enable=true op.format.cleanToken.revokeCert=true op.format.cleanToken.revokeCert.reason=0 op.format.cleanToken.tks.conn=tks1 -op.format.cleanToken.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.cleanToken.update.applet.directory=/usr/share/pki/tps/applets op.format.cleanToken.update.applet.emptyToken.enable=true op.format.cleanToken.update.applet.encryption=true op.format.cleanToken.update.applet.requiredVersion=1.4.58768072 @@ -1853,7 +1853,7 @@ op.format.soCleanSOToken.loginRequest.enable=false op.format.soCleanSOToken.revokeCert=true op.format.soCleanSOToken.revokeCert.reason=0 op.format.soCleanSOToken.tks.conn=tks1 -op.format.soCleanSOToken.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.soCleanSOToken.update.applet.directory=/usr/share/pki/tps/applets op.format.soCleanSOToken.update.applet.emptyToken.enable=true op.format.soCleanSOToken.update.applet.encryption=true op.format.soCleanSOToken.update.applet.requiredVersion=1.4.58768072 @@ -1875,7 +1875,7 @@ op.format.soCleanUserToken.loginRequest.enable=false op.format.soCleanUserToken.revokeCert=true op.format.soCleanUserToken.revokeCert.reason=0 op.format.soCleanUserToken.tks.conn=tks1 -op.format.soCleanUserToken.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.soCleanUserToken.update.applet.directory=/usr/share/pki/tps/applets op.format.soCleanUserToken.update.applet.emptyToken.enable=true op.format.soCleanUserToken.update.applet.encryption=true op.format.soCleanUserToken.update.applet.requiredVersion=1.4.58768072 @@ -1897,7 +1897,7 @@ op.format.soKey.loginRequest.enable=true op.format.soKey.revokeCert=true op.format.soKey.revokeCert.reason=0 op.format.soKey.tks.conn=tks1 -op.format.soKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.soKey.update.applet.directory=/usr/share/pki/tps/applets op.format.soKey.update.applet.emptyToken.enable=true op.format.soKey.update.applet.encryption=true op.format.soKey.update.applet.requiredVersion=1.4.58768072 @@ -1919,7 +1919,7 @@ op.format.soUserKey.loginRequest.enable=false op.format.soUserKey.revokeCert=true op.format.soUserKey.revokeCert.reason=0 op.format.soUserKey.tks.conn=tks1 -op.format.soUserKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.soUserKey.update.applet.directory=/usr/share/pki/tps/applets op.format.soUserKey.update.applet.emptyToken.enable=true op.format.soUserKey.update.applet.encryption=true op.format.soUserKey.update.applet.requiredVersion=1.4.58768072 @@ -1941,7 +1941,7 @@ op.format.tokenKey.loginRequest.enable=true op.format.tokenKey.revokeCert=true op.format.tokenKey.revokeCert.reason=0 op.format.tokenKey.tks.conn=tks1 -op.format.tokenKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.tokenKey.update.applet.directory=/usr/share/pki/tps/applets op.format.tokenKey.update.applet.emptyToken.enable=true op.format.tokenKey.update.applet.encryption=true op.format.tokenKey.update.applet.requiredVersion=1.4.58768072 @@ -1963,7 +1963,7 @@ op.format.userKey.loginRequest.enable=true op.format.userKey.revokeCert=true op.format.userKey.revokeCert.reason=0 op.format.userKey.tks.conn=tks1 -op.format.userKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.format.userKey.update.applet.directory=/usr/share/pki/tps/applets op.format.userKey.update.applet.emptyToken.enable=true op.format.userKey.update.applet.encryption=true op.format.userKey.update.applet.requiredVersion=1.4.58768072 @@ -1983,7 +1983,7 @@ op.pinReset.userKey.loginRequest.enable=true op.pinReset.userKey.pinReset.pin.maxLen=10 op.pinReset.userKey.pinReset.pin.minLen=4 op.pinReset.userKey.tks.conn=tks1 -op.pinReset.userKey.update.applet.directory=[pki_source_subsystem_path]/applets +op.pinReset.userKey.update.applet.directory=/usr/share/pki/tps/applets op.pinReset.userKey.update.applet.emptyToken.enable=true op.pinReset.userKey.update.applet.enable=false op.pinReset.userKey.update.applet.encryption=true