diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-20 22:59:15 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-30 12:00:36 -0400 |
| commit | d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48 (patch) | |
| tree | 27816db3b38935f4e4c05bdfd5f347fd7ec4669e /base/tps/setup | |
| parent | 1d53a9dd567f395bcaf65376be9f6c3319ba51ce (diff) | |
| download | pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.tar.gz pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.tar.xz pki-d78d7442be02b6b83d9dad3fc089fa9f9d8ceb48.zip | |
Renamed SERVER_NAME and PKI_MACHINE_NAME into PKI_HOSTNAME.
The SERVER_NAME and PKI_MACHINE_NAME variables have been renamed
into PKI_HOSTNAME for consistency.
Diffstat (limited to 'base/tps/setup')
| -rwxr-xr-x | base/tps/setup/create.pl | 2 | ||||
| -rw-r--r-- | base/tps/setup/pkidaemon_registry | 4 | ||||
| -rw-r--r-- | base/tps/setup/registry_instance | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/base/tps/setup/create.pl b/base/tps/setup/create.pl index eb631b27c..8082d5847 100755 --- a/base/tps/setup/create.pl +++ b/base/tps/setup/create.pl @@ -676,7 +676,7 @@ sub CopyTemplate while (<IN>) { s/\[PKI_INSTANCE_PATH\]/$serverRoot/g; s/\[INSTANCE_ID\]/$instanceID/g; - s/\[SERVER_NAME\]/$serverName/g; + s/\[PKI_HOSTNAME\]/$serverName/g; s/\[PORT\]/$port/g; s/\[PKI_SECURE_PORT\]/$securePort/g; s/\[NICKNAME\]/$nickName/g; diff --git a/base/tps/setup/pkidaemon_registry b/base/tps/setup/pkidaemon_registry index f74f6c83c..8b872f8f6 100644 --- a/base/tps/setup/pkidaemon_registry +++ b/base/tps/setup/pkidaemon_registry @@ -36,8 +36,8 @@ export PKI_FORTITUDE_DIR PKI_NSS_CONF=[NSS_CONF] export PKI_NSS_CONF -PKI_SERVER_NAME=[SERVER_NAME] -export PKI_SERVER_NAME +PKI_HOSTNAME=[PKI_HOSTNAME] +export PKI_HOSTNAME PKI_LOCK_FILE="[PKI_LOCKDIR]/${PKI_INSTANCE_ID}.pid" export PKI_LOCK_FILE diff --git a/base/tps/setup/registry_instance b/base/tps/setup/registry_instance index 040beba68..c07668faa 100644 --- a/base/tps/setup/registry_instance +++ b/base/tps/setup/registry_instance @@ -33,8 +33,8 @@ export PKI_FORTITUDE_DIR PKI_NSS_CONF=[NSS_CONF] export PKI_NSS_CONF -PKI_SERVER_NAME=[SERVER_NAME] -export PKI_SERVER_NAME +PKI_HOSTNAME=[PKI_HOSTNAME] +export PKI_HOSTNAME PKI_LOCK_FILE="[PKI_LOCKDIR]/${PKI_INSTANCE_ID}.pid" export PKI_LOCK_FILE |