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.

7 files changed, 44 insertions, 44 deletions

diff --git a/base/ra/apache/conf/httpd.conf b/base/ra/apache/conf/httpd.conf
index 656134637..2c6cd185d 100644
--- a/base/ra/apache/conf/httpd.conf
+++ b/base/ra/apache/conf/httpd.conf
@@ -47,7 +47,7 @@
 #
 # Do NOT add a slash at the end of the directory path.
 #
-ServerRoot "[SERVER_ROOT]"
+ServerRoot "[PKI_INSTANCE_PATH]"
 
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
@@ -271,10 +271,10 @@ LoadModule cgi_module [FORTITUDE_LIB_DIR]/modules/mod_cgi.so
 </Location>
 
 #
-# Load config files from the config directory "[SERVER_ROOT]/conf".
+# Load config files from the config directory "[PKI_INSTANCE_PATH]/conf".
 #
 #Include conf.d/*.conf
-Include [SERVER_ROOT]/conf/perl.conf
+Include [PKI_INSTANCE_PATH]/conf/perl.conf
 
 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -350,7 +350,7 @@ UseCanonicalName Off
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "[SERVER_ROOT]/docroot"
+DocumentRoot "[PKI_INSTANCE_PATH]/docroot"
 
 #
 # Each directory to which Apache has access can be configured with respect
@@ -375,7 +375,7 @@ DocumentRoot "[SERVER_ROOT]/docroot"
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "[SERVER_ROOT]/docroot">
+<Directory "[PKI_INSTANCE_PATH]/docroot">
 
 #
 # Possible values for the Options directive are "None", "All",
@@ -592,9 +592,9 @@ ServerSignature Off
 # We include the /icons/ alias for FancyIndexed directory listings.  If you
 # do not use FancyIndexing, you may comment this out.
 #
-Alias /icons/ "[SERVER_ROOT]/icons/"
+Alias /icons/ "[PKI_INSTANCE_PATH]/icons/"
 
-<Directory "[SERVER_ROOT]/icons">
+<Directory "[PKI_INSTANCE_PATH]/icons">
     Options Indexes MultiViews
     AllowOverride None
     Require all granted
@@ -605,9 +605,9 @@ Alias /icons/ "[SERVER_ROOT]/icons/"
 # the manual, even if you choose to move your DocumentRoot.  You may comment
 # this out if you do not care for the documentation.
 #
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "[SERVER_ROOT]/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "[PKI_INSTANCE_PATH]/manual$1"
 
-<Directory "[SERVER_ROOT]/manual">
+<Directory "[PKI_INSTANCE_PATH]/manual">
     Options Indexes
     AllowOverride None
     Require all granted
@@ -628,7 +628,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "[SERVER_ROOT]/manual$1
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ "[SERVER_ROOT]/cgi-bin/"
+ScriptAlias /cgi-bin/ "[PKI_INSTANCE_PATH]/cgi-bin/"
 
 <IfModule mod_cgid.c>
 #
@@ -639,10 +639,10 @@ ScriptAlias /cgi-bin/ "[SERVER_ROOT]/cgi-bin/"
 </IfModule>
 
 #
-# "[SERVER_ROOT]/cgi-bin" should be changed to whatever your ScriptAliased
+# "[PKI_INSTANCE_PATH]/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "[SERVER_ROOT]/cgi-bin">
+<Directory "[PKI_INSTANCE_PATH]/cgi-bin">
     AllowOverride None
     Options ExecCGI
     Require all granted
@@ -1040,7 +1040,7 @@ BrowserMatch "^gnome-vfs" redirect-carefully
 #<IfModule mod_ssl.c>
 #    Include conf/ssl.conf
 #</IfModule>
-Include [SERVER_ROOT]/conf/nss.conf
+Include [PKI_INSTANCE_PATH]/conf/nss.conf
 
 ### Section 3: Virtual Hosts
 #
diff --git a/base/ra/apache/conf/nss.conf b/base/ra/apache/conf/nss.conf
index ccce188e3..38081b867 100644
--- a/base/ra/apache/conf/nss.conf
+++ b/base/ra/apache/conf/nss.conf
@@ -37,7 +37,7 @@ AddType application/x-pkcs7-crl    .crl
 #   The filtering dialog program (`builtin' is a internal
 #   terminal dialog) has to provide the pass phrase on stdout.
 #NSSPassPhraseDialog  builtin
-NSSPassPhraseDialog  defer:[SERVER_ROOT]/conf/password.conf
+NSSPassPhraseDialog  defer:[PKI_INSTANCE_PATH]/conf/password.conf
 
 
 #   Pass Phrase Helper:
@@ -84,8 +84,8 @@ NSSSession3CacheTimeout 86400
 #NSSOCSPDefaultName caCert 
 
 # mod_ssl logs to separate log files, you can choose to do that if you'd like
-ErrorLog [SERVER_ROOT]/logs/error_log
-TransferLog [SERVER_ROOT]/logs/access_log
+ErrorLog [PKI_INSTANCE_PATH]/logs/error_log
+TransferLog [PKI_INSTANCE_PATH]/logs/access_log
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -106,7 +106,7 @@ NSSNickname "Server-Cert cert-[PKI_INSTANCE_ID]"
 #   The NSS security database directory that holds the certificates and
 #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
 #   Provide the directory that these files exist.
-NSSCertificateDatabase  [SERVER_ROOT]/alias
+NSSCertificateDatabase  [PKI_INSTANCE_PATH]/alias
 
 #   Client Authentication (Type):
 #   Client certificate verification type.  Types are none, optional and
@@ -166,7 +166,7 @@ NSSVerifyClient require
 #   Per-Server Logging:
 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-#CustomLog [SERVER_ROOT]/logs/ssl_request_log \
+#CustomLog [PKI_INSTANCE_PATH]/logs/ssl_request_log \
 #          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>                                  
@@ -179,8 +179,8 @@ NSSVerifyClient require
 #ServerAdmin you@example.com
 
 # mod_ssl logs to separate log files, you can choose to do that if you'd like
-ErrorLog [SERVER_ROOT]/logs/error_log
-TransferLog [SERVER_ROOT]/logs/access_log
+ErrorLog [PKI_INSTANCE_PATH]/logs/error_log
+TransferLog [PKI_INSTANCE_PATH]/logs/access_log
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -201,7 +201,7 @@ NSSNickname "Server-Cert cert-[PKI_INSTANCE_ID]"
 #   The NSS security database directory that holds the certificates and
 #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
 #   Provide the directory that these files exist.
-NSSCertificateDatabase  [SERVER_ROOT]/alias
+NSSCertificateDatabase  [PKI_INSTANCE_PATH]/alias
 
 #   Client Authentication (Type):
 #   Client certificate verification type.  Types are none, optional and
@@ -261,7 +261,7 @@ NSSVerifyClient none
 #   Per-Server Logging:
 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-#CustomLog [SERVER_ROOT]/logs/ssl_request_log \
+#CustomLog [PKI_INSTANCE_PATH]/logs/ssl_request_log \
 #          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>                                  
diff --git a/base/ra/apache/conf/perl.conf b/base/ra/apache/conf/perl.conf
index 02a503f74..259808e75 100644
--- a/base/ra/apache/conf/perl.conf
+++ b/base/ra/apache/conf/perl.conf
@@ -53,8 +53,8 @@ LoadModule perl_module [FORTITUDE_LIB_DIR]/modules/mod_perl.so
 PerlModule ModPerl::Registry
 PerlModule [FORTITUDE_APACHE]::compat
 PerlModule PKI::RA::wizard
-PerlSetEnv PKI_DOCROOT [SERVER_ROOT]/docroot
-PerlSetEnv PKI_ROOT [SERVER_ROOT]
+PerlSetEnv PKI_DOCROOT [PKI_INSTANCE_PATH]/docroot
+PerlSetEnv PKI_ROOT [PKI_INSTANCE_PATH]
 <Location /ra/admin/console/config/wizard>
    SetHandler perl-script
    PerlHandler PKI::RA::Wizard
@@ -68,7 +68,7 @@ PerlSetEnv PKI_ROOT [SERVER_ROOT]
 </Location>
 
 PerlModule ModPerl::PerlRun
-Alias /ee/ [SERVER_ROOT]/docroot/ee/
+Alias /ee/ [PKI_INSTANCE_PATH]/docroot/ee/
 <Location /ee/ >
   SetHandler perl-script
   PerlHandler ModPerl::PerlRun
@@ -76,7 +76,7 @@ Alias /ee/ [SERVER_ROOT]/docroot/ee/
   PerlSendHeader On
 </Location>
 
-Alias /agent/ [SERVER_ROOT]/docroot/agent/
+Alias /agent/ [PKI_INSTANCE_PATH]/docroot/agent/
 <Location /agent/ >
   SetHandler perl-script
   PerlHandler ModPerl::PerlRun
@@ -84,7 +84,7 @@ Alias /agent/ [SERVER_ROOT]/docroot/agent/
   PerlSendHeader On
 </Location>
 
-Alias /admin/ [SERVER_ROOT]/docroot/admin/
+Alias /admin/ [PKI_INSTANCE_PATH]/docroot/admin/
 <Location /admin/ >
   SetHandler perl-script
   PerlHandler ModPerl::PerlRun
diff --git a/base/ra/etc/init.d/pki-rad b/base/ra/etc/init.d/pki-rad
index 666bf6387..7da9775f9 100755
--- a/base/ra/etc/init.d/pki-rad
+++ b/base/ra/etc/init.d/pki-rad
@@ -24,7 +24,7 @@
 # description:  Registration Authority (Apache)
 # processname:  pki-rad
 # piddir:       /var/run/pki/ra
-# config:       ${PKI_SERVER_ROOT}/conf/httpd.conf
+# config:       ${PKI_INSTANCE_PATH}/conf/httpd.conf
 
 PROG_NAME=`basename $0`
 SERVICE_NAME="pki-rad"
diff --git a/base/ra/setup/pkidaemon_registry b/base/ra/setup/pkidaemon_registry
index 9aa1eeaee..dee8f8dfd 100644
--- a/base/ra/setup/pkidaemon_registry
+++ b/base/ra/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_ra_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/ra/setup/registry_instance b/base/ra/setup/registry_instance
index 8fb0d6233..7bc001b1b 100644
--- a/base/ra/setup/registry_instance
+++ b/base/ra/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_ra_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
diff --git a/base/ra/shared/conf/CS.cfg.in b/base/ra/shared/conf/CS.cfg.in
index 17c339eed..ef4cfd5f2 100644
--- a/base/ra/shared/conf/CS.cfg.in
+++ b/base/ra/shared/conf/CS.cfg.in
@@ -16,8 +16,8 @@ request._001=# Request Queue Parameters
 request._002=#########################################
 agent.authorized_groups=administrators,agents
 admin.authorized_groups=administrators
-database.dbfile=[SERVER_ROOT]/conf/dbfile
-database.lockfile=[SERVER_ROOT]/conf/dblock
+database.dbfile=[PKI_INSTANCE_PATH]/conf/dbfile
+database.lockfile=[PKI_INSTANCE_PATH]/conf/dblock
 request.renewal.approve_request.0.ca=ca1
 request.renewal.approve_request.0.plugin=PKI::Request::Plugin::RequestToCA
 request.renewal.approve_request.0.profileId=caDualRAuserCert
@@ -97,7 +97,7 @@ 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.instanceDir=[SERVER_ROOT]
+service.instanceDir=[PKI_INSTANCE_PATH]
 service.securePort=[PKI_SECURE_PORT]
 service.non_clientauth_securePort=[NON_CLIENTAUTH_SECURE_PORT]
 service.unsecurePort=[PKI_UNSECURE_PORT]
@@ -144,13 +144,13 @@ logging._038=#                              chatty version of the above
 logging._039=#     10 - all logging
 logging._040=#########################################
 logging.debug.enable=true
-logging.debug.filename=[SERVER_ROOT]/logs/ra-debug.log
+logging.debug.filename=[PKI_INSTANCE_PATH]/logs/ra-debug.log
 logging.debug.level=7
 logging.audit.enable=true
-logging.audit.filename=[SERVER_ROOT]/logs/ra-audit.log
+logging.audit.filename=[PKI_INSTANCE_PATH]/logs/ra-audit.log
 logging.audit.level=10
 logging.error.enable=true
-logging.error.filename=[SERVER_ROOT]/logs/ra-error.log
+logging.error.filename=[PKI_INSTANCE_PATH]/logs/ra-error.log
 logging.error.level=10
 conn.ca1._000=#########################################
 conn.ca1._001=# CA connection