diff options
| author | Ade Lee <alee@redhat.com> | 2012-10-17 16:17:54 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-10-18 17:30:01 -0400 |
| commit | 643c089887db3369363e2b88dde19ef3a97029a2 (patch) | |
| tree | bf83cb714fcf35190d8108fd71a6ae8671add303 /base/tps | |
| parent | 8973480558c6b87c4aa6e1fdcd48b6d98c05a042 (diff) | |
| download | pki-643c089887db3369363e2b88dde19ef3a97029a2.tar.gz pki-643c089887db3369363e2b88dde19ef3a97029a2.tar.xz pki-643c089887db3369363e2b88dde19ef3a97029a2.zip | |
Fixes to get TPS to configure correctly
1. Reorder http.conf to actually read worker config
2. Change functions so that the TPS would restart. Before restarts
would fail because the tus link already exists
3. Modify system verification test to return correctly when tests
are successful
Diffstat (limited to 'base/tps')
| -rw-r--r-- | base/tps/apache/conf/httpd.conf | 8 | ||||
| -rw-r--r-- | base/tps/src/engine/RA.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/base/tps/apache/conf/httpd.conf b/base/tps/apache/conf/httpd.conf index a9410849c..bf5864174 100644 --- a/base/tps/apache/conf/httpd.conf +++ b/base/tps/apache/conf/httpd.conf @@ -130,6 +130,11 @@ MaxRequestsPerChild 0 # MaxSpareThreads: maximum number of worker threads which are kept spare # ThreadsPerChild: constant number of worker threads in each server process # MaxRequestsPerChild: maximum number of requests a server process serves + +# MPM worker module is a loadable module as of 2.4 +# Module must be loaded before the configuration stanza +LoadModule mpm_worker_module /etc/httpd/modules/mod_mpm_worker.so + <IfModule worker.c> ServerLimit 1 StartServers 1 @@ -232,9 +237,6 @@ Listen [PORT] # LoadModule foo_module modules/mod_foo.so # -# MPM worker module is a loadable module as of 2.4 -LoadModule mpm_worker_module /etc/httpd/modules/mod_mpm_worker.so - LoadModule authz_core_module /etc/httpd/modules/mod_authz_core.so [FORTITUDE_AUTH_MODULES] # Module for User and Group diff --git a/base/tps/src/engine/RA.cpp b/base/tps/src/engine/RA.cpp index 436225045..82f53c161 100644 --- a/base/tps/src/engine/RA.cpp +++ b/base/tps/src/engine/RA.cpp @@ -3483,7 +3483,7 @@ TPS_PUBLIC bool RA::verifySystemCertByNickname(const char *nickname, const char */ TPS_PUBLIC bool RA::verifySystemCerts() { bool verifyResult = false; - bool rv = false; /* final return value */ + bool rv = true; /* final return value */ char configname[256]; char configname_nn[256]; char configname_cu[256]; |