Skip to content

Commit

Permalink
Clean up dbs.enableRandomSerialNumbers initialization
Browse files Browse the repository at this point in the history
The dbs.enableRandomSerialNumbers has been modified to have
a default value of 'false', then change to 'true' if the
pki_random_serial_numbers_enable is set to True.
  • Loading branch information
edewata committed Jul 26, 2023
1 parent c3572ac commit f216487
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion base/ca/shared/conf/CS.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ cmsgateway._029=##
cmsgateway.enableAdminEnroll=false
https.port=[pki_https_port]
http.port=[pki_http_port]
dbs.enableSerialManagement=[pki_random_serial_numbers_enable]
dbs.enableSerialManagement=false
dbs.requestDN=ou=ca, ou=requests
dbs.serialDN=ou=certificateRepository, ou=ca
dbs.beginReplicaNumber=1
Expand Down
4 changes: 2 additions & 2 deletions base/server/python/pki/server/deployment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1138,8 +1138,8 @@ def configure_ca(self, subsystem):
subsystem.config['dbs.serialLowWaterMark'] = '2000000'
subsystem.config['dbs.serialCloneTransferNumber'] = '10000'
subsystem.config['dbs.serialRangeDN'] = 'ou=certificateRepository,ou=ranges'
subsystem.config['dbs.enableRandomSerialNumbers'] = \
self.mdict['pki_random_serial_numbers_enable']
if config.str2bool(self.mdict['pki_random_serial_numbers_enable']):
subsystem.config['dbs.enableRandomSerialNumbers'] = 'true'
subsystem.config['dbs.randomSerialNumberCounter'] = '0'

serial_number_range_start = self.mdict.get('pki_serial_number_range_start')
Expand Down
4 changes: 0 additions & 4 deletions base/server/python/pki/server/deployment/pkiparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,6 @@ def compose_pki_master_dictionary(self):

self.mdict['pki_standalone'] = self.mdict['pki_standalone'].lower()

if self.mdict['pki_subsystem'] == "CA":
self.mdict['pki_random_serial_numbers_enable'] = \
self.mdict['pki_random_serial_numbers_enable'].lower()

# Configuration scriptlet
# 'Security Domain' Configuration name/value pairs
# 'Subsystem Name' Configuration name/value pairs
Expand Down

0 comments on commit f216487

Please sign in to comment.