diff options
| author | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-19 21:00:40 +0000 |
|---|---|---|
| committer | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-11-19 21:00:40 +0000 |
| commit | 2ab4b4058a240143e513db050bbf4170e9115ef1 (patch) | |
| tree | a00195c6f63f11ee5e2fd9c4fc5f3c216ef7ace2 /pki/base/tps/apache/conf/httpd.conf | |
| parent | e73bde97720375973af57a29c5dd62aaec6342f2 (diff) | |
| download | pki-2ab4b4058a240143e513db050bbf4170e9115ef1.tar.gz pki-2ab4b4058a240143e513db050bbf4170e9115ef1.tar.xz pki-2ab4b4058a240143e513db050bbf4170e9115ef1.zip | |
Merge CA changes into KRA,OCSP & TKS
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1575 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/tps/apache/conf/httpd.conf')
| -rw-r--r-- | pki/base/tps/apache/conf/httpd.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pki/base/tps/apache/conf/httpd.conf b/pki/base/tps/apache/conf/httpd.conf index 5ad748f55..878a4e655 100644 --- a/pki/base/tps/apache/conf/httpd.conf +++ b/pki/base/tps/apache/conf/httpd.conf @@ -78,7 +78,7 @@ ServerRoot "[SERVER_ROOT]" # identification number when it starts. # <IfModule !mpm_netware.c> -PidFile run/[INSTANCE_ID].pid +PidFile run/[PKI_INSTANCE_ID].pid </IfModule> # @@ -268,7 +268,7 @@ LoadModule tokendb_module [FORTITUDE_MODULE]/mod_tokendb.so </Location> # -# Load config files from the config directory "/etc/[INSTANCE_ID]/conf.d". +# Load config files from the config directory "/etc/[PKI_INSTANCE_ID]/conf.d". # #Include conf.d/*.conf Include [SERVER_ROOT]/conf/perl.conf @@ -295,10 +295,10 @@ Include [SERVER_ROOT]/conf/perl.conf <IfModule !mpm_winnt.c> <IfModule !mpm_netware.c> # -# If you wish [INSTANCE_ID] to run as a different user or group, you must run -# [INSTANCE_ID] as root initially and it will switch. +# If you wish [PKI_INSTANCE_ID] to run as a different user or group, you must run +# [PKI_INSTANCE_ID] as root initially and it will switch. # -# User/Group: The name (or #number) of the user/group to run [INSTANCE_ID] as. +# User/Group: The name (or #number) of the user/group to run [PKI_INSTANCE_ID] as. # . On SCO (ODT 3) use "User nouser" and "Group nogroup". # . On HPUX you may not be able to use shared memory as nobody, and the # suggested workaround is to create a user www and use that user. @@ -306,8 +306,8 @@ Include [SERVER_ROOT]/conf/perl.conf # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # -User [USERID] -Group [GROUPID] +User [PKI_USER] +Group [PKI_GROUP] #Group #-1 </IfModule> </IfModule> |