summaryrefslogtreecommitdiffstats
path: root/base/setup/pkicreate
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2013-05-20 22:18:48 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2013-05-30 12:00:11 -0400
commit8c4d4ae8466ddc59233b477153e9f7a2355ae37f (patch)
tree1bbcbdd764b85567eb9d408d4dbfbb00b5d162be /base/setup/pkicreate
parent1e25d6ed41919db050f5efddefff2df9c5267e91 (diff)
downloadpki-8c4d4ae8466ddc59233b477153e9f7a2355ae37f.tar.gz
pki-8c4d4ae8466ddc59233b477153e9f7a2355ae37f.tar.xz
pki-8c4d4ae8466ddc59233b477153e9f7a2355ae37f.zip
Renamed SECURE_PORT into PKI_SECURE_PORT.
The SECURE_PORT variable in RA and TPS has been renamed into PKI_SECURE_PORT to match the Tomcat-based subsystems.
Diffstat (limited to 'base/setup/pkicreate')
-rwxr-xr-xbase/setup/pkicreate9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index a9ac1890e..590db12db 100755
--- a/base/setup/pkicreate
+++ b/base/setup/pkicreate
@@ -267,7 +267,6 @@ my $NSS_CONF = "NSS_CONF";
my $OBJ_EXT = "OBJ_EXT";
my $PORT = "PORT";
my $PROCESS_ID = "PROCESS_ID";
-my $SECURE_PORT = "SECURE_PORT";
my $NON_CLIENTAUTH_SECURE_PORT = "NON_CLIENTAUTH_SECURE_PORT";
my $SECURITY_LIBRARIES = "SECURITY_LIBRARIES";
my $SERVER_NAME = "SERVER_NAME";
@@ -287,8 +286,9 @@ my $PKI_PIDDIR = "PKI_PIDDIR";
my $PKI_LOCKDIR = "PKI_LOCKDIR";
# Template slot constants (CA, KRA, OCSP, TKS, RA, TPS)
-my $PKI_INSTANCE_ID_SLOT = "PKI_INSTANCE_ID";
-my $PKI_REGISTRY_FILE_SLOT = "PKI_REGISTRY_FILE";
+my $PKI_INSTANCE_ID_SLOT = "PKI_INSTANCE_ID";
+my $PKI_REGISTRY_FILE_SLOT = "PKI_REGISTRY_FILE";
+my $PKI_SECURE_PORT_SLOT = "PKI_SECURE_PORT";
# Template slot constants (CA, KRA, OCSP, TKS)
my $INSTALL_TIME = "INSTALL_TIME";
@@ -300,7 +300,6 @@ my $PKI_INSTANCE_PATH_SLOT = "PKI_INSTANCE_PATH";
my $PKI_INSTANCE_ROOT_SLOT = "PKI_INSTANCE_ROOT";
my $PKI_MACHINE_NAME_SLOT = "PKI_MACHINE_NAME";
my $PKI_RANDOM_NUMBER_SLOT = "PKI_RANDOM_NUMBER";
-my $PKI_SECURE_PORT_SLOT = "PKI_SECURE_PORT";
my $PKI_EE_SECURE_PORT_SLOT = "PKI_EE_SECURE_PORT";
my $PKI_EE_SECURE_CLIENT_AUTH_PORT_SLOT = "PKI_EE_SECURE_CLIENT_AUTH_PORT";
my $PKI_EE_SECURE_CLIENT_AUTH_PORT_UI_SLOT = "PKI_EE_SECURE_CLIENT_AUTH_PORT_UI";
@@ -2274,7 +2273,7 @@ sub process_pki_templates
$slot_hash{$OBJ_EXT} = $obj_ext;
$slot_hash{$PORT} = $unsecure_port;
$slot_hash{$PROCESS_ID} = $$;
- $slot_hash{$SECURE_PORT} = $secure_port;
+ $slot_hash{$PKI_SECURE_PORT_SLOT} = $secure_port;
$slot_hash{$NON_CLIENTAUTH_SECURE_PORT} = $non_clientauth_secure_port;
$slot_hash{$SECURITY_LIBRARIES} = $default_security_libraries;
$slot_hash{$SERVER_NAME} = $host;