diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-18 10:52:06 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-18 11:06:37 -0700 |
commit | 924403a14e92112c3c3d696319759b65eb57a30c (patch) | |
tree | ae097f21c022bd21b4c8b655a0030a8bef3953a3 /base/deploy/src/pkidestroy | |
parent | 488480629da8cd7c7263fab9773ef5860ad12947 (diff) | |
download | pki-924403a14e92112c3c3d696319759b65eb57a30c.tar.gz pki-924403a14e92112c3c3d696319759b65eb57a30c.tar.xz pki-924403a14e92112c3c3d696319759b65eb57a30c.zip |
PKI Deployment Scriptlets
* Introduced concept of "admin-domain" originally as a
separate folder, and later incorporated this concept
into an optional instance prefix
* Revised definition of <pki_instance_id> to be identified
as "[<pki_admin_domain_name>-]<pki_instance_name>
* Changed NSS security database model from one shared
database by BOTH a single Tomcat AND single Apache instance
into one per Tomcat instance (shared by CA/KRA/OCSP/TKS) and
one per Apache instance (shared by RA/TPS)
* Altered Configuration 'scriptlet' to invoke Jython for
access to new Java configuration servlet
* Renamed various "scriptlets" to comply with this new layout
* Re-aligned code to account for revised layout documented at
http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment
Diffstat (limited to 'base/deploy/src/pkidestroy')
-rwxr-xr-x | base/deploy/src/pkidestroy | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy index c54ba9a78..2d0b5d285 100755 --- a/base/deploy/src/pkidestroy +++ b/base/deploy/src/pkidestroy @@ -33,6 +33,7 @@ try: import random import socket import string + import struct import time from time import strftime as date from pki.deployment import pkiconfig as config @@ -69,19 +70,12 @@ def main(argv): config.pki_certificate_timestamp =\ date('%Y-%m-%d %H:%M:%S', time.localtime(ticks)) + # Obtain the architecture bit-size + config.pki_architecture = struct.calcsize("P") * 8 + # Retrieve hostname config.pki_hostname = socket.gethostname() - # Generate a random 'pin' for use as the security database password - pin_low = 100000000000 - pin_high = 999999999999 - config.pki_pin = random.randint(pin_low, pin_high) - - # Generate a one-time pin to be used prior to configuration - config.pki_one_time_pin =\ - ''.join(random.choice(string.ascii_letters + string.digits)\ - for x in range(20)) - # Initialize 'pretty print' for objects pp = pprint.PrettyPrinter(indent=4) @@ -131,6 +125,9 @@ def main(argv): extra=config.PKI_INDENTATION_LEVEL_0) # Override PKI configuration file values with 'custom' command-line values. + if not config.pki_admin_domain_name is None: + config.pki_common_dict['pki_admin_domain_name'] =\ + config.pki_admin_domain_name if not config.pki_instance_name is None: config.pki_common_dict['pki_instance_name'] =\ config.pki_instance_name |