diff options
Diffstat (limited to 'base/deploy/src')
| -rw-r--r-- | base/deploy/src/scriptlets/configuration.jy | 2 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/configuration.py | 2 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkiconfig.py | 76 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkijython.py | 2 |
4 files changed, 41 insertions, 41 deletions
diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index 60d92a759..df04470e2 100644 --- a/base/deploy/src/scriptlets/configuration.jy +++ b/base/deploy/src/scriptlets/configuration.jy @@ -37,7 +37,7 @@ def main(argv): # Optionally enable a java debugger (e. g. - 'eclipse'): if util.str2bool(master['pki_enable_java_debugger']): - config.wait_to_attach_an_external_java_debugger() + PKIConfig.wait_to_attach_an_external_java_debugger() # IMPORTANT: Unfortunately, 'jython 2.2' does NOT support logging! diff --git a/base/deploy/src/scriptlets/configuration.py b/base/deploy/src/scriptlets/configuration.py index d3eb65652..64b7d6eae 100644 --- a/base/deploy/src/scriptlets/configuration.py +++ b/base/deploy/src/scriptlets/configuration.py @@ -85,7 +85,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Optionally prepare to enable a java debugger # (e. g. - 'eclipse'): if util.str2bool(master['pki_enable_java_debugger']): - config.prepare_for_an_external_java_debugger( + PKIConfig.prepare_for_an_external_java_debugger( master['pki_target_tomcat_conf_instance_id']) tomcat_instance_subsystems =\ util.instance.tomcat_instance_subsystems() diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py index fe6c087a0..d1cc35347 100644 --- a/base/deploy/src/scriptlets/pkiconfig.py +++ b/base/deploy/src/scriptlets/pkiconfig.py @@ -115,6 +115,44 @@ class PKIConfig: PKI_CERTDB_SELINUX_CONTEXT = "pki_tomcat_cert_t" PKI_PORT_SELINUX_CONTEXT = "http_port_t" + # NOTE: To utilize the 'preparations_for_an_external_java_debugger(master)' + # and 'wait_to_attach_an_external_java_debugger(master)' functions, + # change 'pki_enable_java_debugger=False' to + # 'pki_enable_java_debugger=True' in the appropriate + # 'pkideployment.cfg' configuration file. + def prepare_for_an_external_java_debugger(instance): + print + print PKI_DEPLOYMENT_INTERRUPT_BANNER + print + print "The following 'JAVA_OPTS' MUST be enabled (uncommented) in" + print "'%s':" % instance + print + print " JAVA_OPTS=\"-Xdebug -Xrunjdwp:transport=dt_socket,\"" + print " \"address=8000,server=y,suspend\"" + print + raw_input("Enable external java debugger 'JAVA_OPTS' "\ + "and press return to continue . . . ") + print + print PKI_DEPLOYMENT_INTERRUPT_BANNER + print + return + + def wait_to_attach_an_external_java_debugger(): + print + print PKI_DEPLOYMENT_INTERRUPT_BANNER + print + print "Attach the java debugger to this process on the port specified by" + print "the 'address' selected by 'JAVA_OPTS' (e. g. - port 8000) and" + print "set any desired breakpoints" + print + raw_input("Please attach an external java debugger "\ + "and press return to continue . . . ") + print + print PKI_DEPLOYMENT_INTERRUPT_BANNER + print + return + + # PKI Deployment Global Variables pki_install_time = None pki_timestamp = None @@ -140,44 +178,6 @@ pki_update_flag = False pki_root_prefix = None -# NOTE: To utilize the 'preparations_for_an_external_java_debugger(master)' -# and 'wait_to_attach_an_external_java_debugger(master)' functions, -# change 'pki_enable_java_debugger=False' to -# 'pki_enable_java_debugger=True' in the appropriate -# 'pkideployment.cfg' configuration file. -def prepare_for_an_external_java_debugger(instance): - print - print PKI_DEPLOYMENT_INTERRUPT_BANNER - print - print "The following 'JAVA_OPTS' MUST be enabled (uncommented) in" - print "'%s':" % instance - print - print " JAVA_OPTS=\"-Xdebug -Xrunjdwp:transport=dt_socket,\"" - print " \"address=8000,server=y,suspend\"" - print - raw_input("Enable external java debugger 'JAVA_OPTS' "\ - "and press return to continue . . . ") - print - print PKI_DEPLOYMENT_INTERRUPT_BANNER - print - return - -def wait_to_attach_an_external_java_debugger(): - print - print PKI_DEPLOYMENT_INTERRUPT_BANNER - print - print "Attach the java debugger to this process on the port specified by" - print "the 'address' selected by 'JAVA_OPTS' (e. g. - port 8000) and" - print "set any desired breakpoints" - print - raw_input("Please attach an external java debugger "\ - "and press return to continue . . . ") - print - print PKI_DEPLOYMENT_INTERRUPT_BANNER - print - return - - # PKI Deployment Global Dictionaries pki_sensitive_dict = None pki_common_dict = None diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py index f1bb70f97..306f203cd 100644 --- a/base/deploy/src/scriptlets/pkijython.py +++ b/base/deploy/src/scriptlets/pkijython.py @@ -652,7 +652,7 @@ class rest_client: # following operating system specific command: # # os.chmod(master['pki_client_admin_cert_p12'], - # config.\ + # PKIConfig.\ # PKI_DEPLOYMENT_DEFAULT_SECURITY_DATABASE_PERMISSIONS) # # Emulate it with a system call. |