From 6260aca7bf54b5406db24ff368b52363a3c9ea28 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 18 Dec 2012 14:46:41 -0500
Subject: WIP

---
 base/deploy/src/pkispawn | 58 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 15 deletions(-)

(limited to 'base/deploy/src/pkispawn')

diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn
index f64d79575..5b1d871f1 100755
--- a/base/deploy/src/pkispawn
+++ b/base/deploy/src/pkispawn
@@ -52,6 +52,10 @@ error was:
 def main(argv):
     "main entry point"
 
+    print "Dogtag 10.0.0 Subsystem Installation"
+    print "------------------------------------"
+    print
+
     config.pki_deployment_executable = os.path.basename(argv[0])
 
     # Only run this program as "root".
@@ -96,7 +100,7 @@ def main(argv):
 
     parser.mandatory.add_argument('-f',
         dest='user_deployment_cfg', action='store',
-        nargs=1, required=True, metavar='<file>',
+        nargs=1, metavar='<file>',
         help='configuration filename '
             '(MUST specify complete path)')
 
@@ -109,12 +113,32 @@ def main(argv):
     config.default_deployment_cfg = config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE
 
     # -f <user deployment config>
-    config.user_deployment_cfg = str(args.user_deployment_cfg).strip('[\']')
+    if not args.user_deployment_cfg is None:
+        config.user_deployment_cfg = str(args.user_deployment_cfg).strip('[\']')
 
     # -u
     config.pki_update_flag = args.pki_update_flag
 
-    parser.validate()
+    if config.user_deployment_cfg is None:
+        config.pki_subsystem = 'CA'
+        value = raw_input('Subsystem type [' + config.pki_subsystem + ']: ')
+        if len(value) > 0:
+            config.pki_subsystem = value
+
+    parser.initialize()
+
+    if config.user_deployment_cfg is None:
+        parser.read_text('pki_instance_name', 'Instance name')
+        parser.read_text('pki_http_port', 'HTTP Port')
+        parser.read_text('pki_https_port', 'Secure HTTP port')
+        parser.read_text('pki_admin_uid', config.pki_subsystem + ' admin UID')
+        parser.read_password('pki_admin_password', config.pki_subsystem + ' admin password')
+        parser.read_text('pki_security_domain_name', 'Security domain name')
+        parser.read_text('pki_ds_hostname', 'Directory server hostname')
+        parser.read_text('pki_ds_ldap_port', 'Directory server port')
+        parser.read_text('pki_ds_base_dn', 'Directory server base DN')
+        parser.read_text('pki_ds_bind_dn', 'Directory server bind DN')
+        parser.read_password('pki_ds_password', 'Directory server password')
 
     if not os.path.exists(config.PKI_DEPLOYMENT_SOURCE_ROOT +\
                           "/" + config.pki_subsystem.lower()):
@@ -162,18 +186,18 @@ def main(argv):
         sys.exit(1)
 
     # NEVER print out 'sensitive' name/value pairs!!!
-    config.pki_log.debug(log.PKI_DICTIONARY_DEFAULT,
-                         extra=config.PKI_INDENTATION_LEVEL_0)
-    config.pki_log.debug(pkilogging.format(config.pki_default_dict),
-                         extra=config.PKI_INDENTATION_LEVEL_0)
-    config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER,
-                         extra=config.PKI_INDENTATION_LEVEL_0)
-    config.pki_log.debug(pkilogging.format(config.pki_web_server_dict),
-                         extra=config.PKI_INDENTATION_LEVEL_0)
-    config.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM,
-                         extra=config.PKI_INDENTATION_LEVEL_0)
-    config.pki_log.debug(pkilogging.format(config.pki_subsystem_dict),
-                         extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(log.PKI_DICTIONARY_DEFAULT,
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(pkilogging.format(config.pki_default_dict),
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(log.PKI_DICTIONARY_WEB_SERVER,
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(pkilogging.format(config.pki_web_server_dict),
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(log.PKI_DICTIONARY_SUBSYSTEM,
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
+    #config.pki_log.debug(pkilogging.format(config.pki_subsystem_dict),
+    #                     extra=config.PKI_INDENTATION_LEVEL_0)
 
     # Read in the PKI slots configuration file.
     parser.compose_pki_slots_dictionary()
@@ -184,6 +208,7 @@ def main(argv):
 
     # Combine the various sectional dictionaries into a PKI master dictionary
     parser.compose_pki_master_dictionary()
+
     if not config.pki_update_flag:
         config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\
                                                   config.pki_log_name
@@ -214,6 +239,9 @@ def main(argv):
     config.pki_log.debug(pkilogging.format(config.pki_master_dict),
                          extra=config.PKI_INDENTATION_LEVEL_0)
 
+    print
+    print "Installation complete."
+
 
 # PKI Deployment Entry Point
 if __name__ == "__main__":
-- 
cgit