summaryrefslogtreecommitdiffstats
path: root/base/tps/setup
diff options
context:
space:
mode:
authorChristina Fu <cfu@redhat.com>2012-08-15 13:32:14 -0700
committerChristina Fu <cfu@redhat.com>2012-08-15 13:32:14 -0700
commit7a5b5b06052a3432e1aec0aec8906cd5941f6fd9 (patch)
tree052bc470521dc24b5aa0b3552e594dbe11a4d660 /base/tps/setup
parent3b1ca60d799ca02305b8a2c61eb279f74787cff0 (diff)
parent7a6b89591732f872db38821c00ec3ce89ef57e7a (diff)
downloadpki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.gz
pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.tar.xz
pki-7a5b5b06052a3432e1aec0aec8906cd5941f6fd9.zip
Merge branch 'master' of git://git.fedorahosted.org/git/pki
Diffstat (limited to 'base/tps/setup')
-rw-r--r--base/tps/setup/pkidaemon_registry2
-rw-r--r--base/tps/setup/registry_instance2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/tps/setup/pkidaemon_registry b/base/tps/setup/pkidaemon_registry
index 6c13a4955..b74c84317 100644
--- a/base/tps/setup/pkidaemon_registry
+++ b/base/tps/setup/pkidaemon_registry
@@ -62,7 +62,7 @@ export RESTART_SERVER
# available, but does not work with some modules (such as PHP).
# The service must be stopped before changing this variable.
#
-PKI_HTTPD=${PKI_FORTITUDE_DIR}/sbin/httpd.worker
+PKI_HTTPD=${PKI_FORTITUDE_DIR}/sbin/httpd
export PKI_HTTPD
#
diff --git a/base/tps/setup/registry_instance b/base/tps/setup/registry_instance
index a77b75f4f..cb907eb61 100644
--- a/base/tps/setup/registry_instance
+++ b/base/tps/setup/registry_instance
@@ -59,7 +59,7 @@ export RESTART_SERVER
# available, but does not work with some modules (such as PHP).
# The service must be stopped before changing this variable.
#
-PKI_HTTPD=${PKI_FORTITUDE_DIR}/sbin/httpd.worker
+PKI_HTTPD=${PKI_FORTITUDE_DIR}/sbin/httpd
export PKI_HTTPD
#