Skip to content

Commit

Permalink
Remove non-configurable pki_source_subsystem_path param
Browse files Browse the repository at this point in the history
  • Loading branch information
@edewata
edewata committed Jul 15, 2023
1 parent aca460d commit f10a99e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion base/server/etc/default.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 12 additions & 12 deletions base/tps/shared/conf/CS.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1456,15 +1456,15 @@ 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
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
Expand Down Expand Up @@ -1798,15 +1798,15 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f10a99e

Please sign in to comment.