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/ra | |
| 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/ra')
| -rw-r--r-- | base/ra/apache/conf/httpd.conf | 2 | ||||
| -rw-r--r-- | base/ra/setup/pkidaemon_registry | 4 | ||||
| -rw-r--r-- | base/ra/setup/registry_instance | 4 | ||||
| -rw-r--r-- | base/ra/shared/conf/CS.cfg.in | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/base/ra/apache/conf/httpd.conf b/base/ra/apache/conf/httpd.conf index 2c6cd185d..297a3be2b 100644 --- a/base/ra/apache/conf/httpd.conf +++ b/base/ra/apache/conf/httpd.conf @@ -338,7 +338,7 @@ ServerAdmin you@example.com # # UseCanonicalName: Determines how Apache constructs self-referencing -# URLs and the SERVER_NAME and SERVER_PORT variables. +# URLs and the PKI_HOSTNAME and SERVER_PORT variables. # When set "Off", Apache will use the Hostname and Port supplied # by the client. When set "On", Apache will use the value of the # ServerName directive. diff --git a/base/ra/setup/pkidaemon_registry b/base/ra/setup/pkidaemon_registry index dee8f8dfd..c7a416ab7 100644 --- a/base/ra/setup/pkidaemon_registry +++ b/base/ra/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/ra/setup/registry_instance b/base/ra/setup/registry_instance index 7bc001b1b..927d400cb 100644 --- a/base/ra/setup/registry_instance +++ b/base/ra/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 diff --git a/base/ra/shared/conf/CS.cfg.in b/base/ra/shared/conf/CS.cfg.in index ef4cfd5f2..682af9dc5 100644 --- a/base/ra/shared/conf/CS.cfg.in +++ b/base/ra/shared/conf/CS.cfg.in @@ -96,7 +96,7 @@ request.server.approve_request.1.templateDir=/usr/share/pki/ra/conf request.server.approve_request.1.templateFile=mail_approve_request.vm request.server.reject_request.num_plugins=0 cs.type=RA -service.machineName=[SERVER_NAME] +service.machineName=[PKI_HOSTNAME] service.instanceDir=[PKI_INSTANCE_PATH] service.securePort=[PKI_SECURE_PORT] service.non_clientauth_securePort=[NON_CLIENTAUTH_SECURE_PORT] @@ -198,7 +198,7 @@ preop.cert.list=sslserver,subsystem preop.cert.sslserver.enable=true preop.cert.subsystem.enable=true preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA -preop.cert.sslserver.dn=CN=[SERVER_NAME], OU=[PKI_INSTANCE_ID] +preop.cert.sslserver.dn=CN=[PKI_HOSTNAME], OU=[PKI_INSTANCE_ID] preop.cert.sslserver.keysize.customsize=2048 preop.cert.sslserver.keysize.size=2048 preop.cert.sslserver.keysize.select=custom |