diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-20 22:47:40 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-30 12:00:27 -0400 |
| commit | 1d53a9dd567f395bcaf65376be9f6c3319ba51ce (patch) | |
| tree | 2d10300b8a889578992bba736619193215741b30 /base/tps/setup | |
| parent | 3e1b7bd930ceb99a9d2baeb9c69432e75ff3b2c6 (diff) | |
| download | pki-1d53a9dd567f395bcaf65376be9f6c3319ba51ce.tar.gz pki-1d53a9dd567f395bcaf65376be9f6c3319ba51ce.tar.xz pki-1d53a9dd567f395bcaf65376be9f6c3319ba51ce.zip | |
Renamed SERVER_ROOT into PKI_INSTANCE_PATH.
The SERVER_ROOT variable in RA and tps has been renamed into
PKI_INSTANCE_PATH to match the Tomcat-based subsystems.
Diffstat (limited to 'base/tps/setup')
| -rwxr-xr-x | base/tps/setup/create.pl | 10 | ||||
| -rw-r--r-- | base/tps/setup/pkidaemon_registry | 10 | ||||
| -rw-r--r-- | base/tps/setup/registry_instance | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/base/tps/setup/create.pl b/base/tps/setup/create.pl index feac2af8e..eb631b27c 100755 --- a/base/tps/setup/create.pl +++ b/base/tps/setup/create.pl @@ -114,7 +114,7 @@ sub PromptUser print ("************************************************\n"); print ("\n"); -ASK_SERVER_ROOT: +ASK_PKI_INSTANCE_PATH: print ("Enter the path to the server root [$defaultServerRoot]: "); chomp ($serverRoot = <STDIN>); if ($serverRoot eq "") { @@ -122,15 +122,15 @@ ASK_SERVER_ROOT: } if ($serverRoot =~ /\/$/) { print ("Error: '$serverRoot' cannot end with '/'.\n"); - goto ASK_SERVER_ROOT; + goto ASK_PKI_INSTANCE_PATH; } if (!(-d $serverRoot)) { print ("Error: '$serverRoot' directory does not exit.\n"); - goto ASK_SERVER_ROOT; + goto ASK_PKI_INSTANCE_PATH; } if (!(-f "$serverRoot/admin-serv/config/adm.conf")) { print ("Error: '$serverRoot' directory does not contain $serverRoot/admin-serv/config/adm.conf.\n"); - goto ASK_SERVER_ROOT; + goto ASK_PKI_INSTANCE_PATH; } # read some good parameters from adm.conf @@ -674,7 +674,7 @@ sub CopyTemplate open(IN, "<$from"); open(OUT, ">$to"); while (<IN>) { - s/\[SERVER_ROOT\]/$serverRoot/g; + s/\[PKI_INSTANCE_PATH\]/$serverRoot/g; s/\[INSTANCE_ID\]/$instanceID/g; s/\[SERVER_NAME\]/$serverName/g; s/\[PORT\]/$port/g; diff --git a/base/tps/setup/pkidaemon_registry b/base/tps/setup/pkidaemon_registry index cac9b3c48..f74f6c83c 100644 --- a/base/tps/setup/pkidaemon_registry +++ b/base/tps/setup/pkidaemon_registry @@ -24,8 +24,8 @@ export PKI_INSTANCE_INITSCRIPT PKI_HTTPD_CONF=[HTTPD_CONF] export PKI_HTTPD_CONF -PKI_SERVER_ROOT=[SERVER_ROOT] -export PKI_SERVER_ROOT +PKI_INSTANCE_PATH=[PKI_INSTANCE_PATH] +export PKI_INSTANCE_PATH PKI_SYSTEM_USER_LIBRARIES=[SYSTEM_USER_LIBRARIES] export PKI_SYSTEM_USER_LIBRARIES @@ -48,10 +48,10 @@ export PKI_PID_FILE PKI_SELINUX_TYPE="pki_tps_t" export PKI_SELINUX_TYPE -pki_instance_configuration_file=${PKI_SERVER_ROOT}/conf/CS.cfg +pki_instance_configuration_file=${PKI_INSTANCE_PATH}/conf/CS.cfg export pki_instance_configuration_file -RESTART_SERVER=${PKI_SERVER_ROOT}/conf/restart_server_after_configuration +RESTART_SERVER=${PKI_INSTANCE_PATH}/conf/restart_server_after_configuration export RESTART_SERVER ######################################################################## @@ -99,7 +99,7 @@ export PKI_INITLOG_ARGS httpd=${PKI_HTTPD} export httpd -pki_logs_directory=${PKI_SERVER_ROOT}/logs +pki_logs_directory=${PKI_INSTANCE_PATH}/logs export pki_logs_directory # see if httpd is linked with the openldap libraries - we need to override diff --git a/base/tps/setup/registry_instance b/base/tps/setup/registry_instance index 3c0f5eb4e..040beba68 100644 --- a/base/tps/setup/registry_instance +++ b/base/tps/setup/registry_instance @@ -21,8 +21,8 @@ export PKI_INSTANCE_INITSCRIPT PKI_HTTPD_CONF=[HTTPD_CONF] export PKI_HTTPD_CONF -PKI_SERVER_ROOT=[SERVER_ROOT] -export PKI_SERVER_ROOT +PKI_INSTANCE_PATH=[PKI_INSTANCE_PATH] +export PKI_INSTANCE_PATH PKI_SYSTEM_USER_LIBRARIES=[SYSTEM_USER_LIBRARIES] export PKI_SYSTEM_USER_LIBRARIES @@ -45,10 +45,10 @@ export PKI_PID_FILE PKI_SELINUX_TYPE="pki_tps_t" export PKI_SELINUX_TYPE -pki_instance_configuration_file=${PKI_SERVER_ROOT}/conf/CS.cfg +pki_instance_configuration_file=${PKI_INSTANCE_PATH}/conf/CS.cfg export pki_instance_configuration_file -RESTART_SERVER=${PKI_SERVER_ROOT}/conf/restart_server_after_configuration +RESTART_SERVER=${PKI_INSTANCE_PATH}/conf/restart_server_after_configuration export RESTART_SERVER ######################################################################## @@ -96,7 +96,7 @@ export PKI_INITLOG_ARGS httpd=${PKI_HTTPD} export httpd -pki_logs_directory=${PKI_SERVER_ROOT}/logs +pki_logs_directory=${PKI_INSTANCE_PATH}/logs export pki_logs_directory # see if httpd is linked with the openldap libraries - we need to override |