diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-11-10 02:36:40 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-11-10 02:36:40 +0000 |
| commit | 52cd682405f7a052d45d83b66cc75f19316ceffe (patch) | |
| tree | 6b76eeddb2d4682db61f8e38462413bc40b59a3d /sca-cpp/trunk/modules/http | |
| parent | 629c1f267e5f7a835891e36ebdae8404740f13e2 (diff) | |
Enable multiple apps to co-exist under different paths in a single Virtual Host and Internet domain.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1200105 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-conf | 6 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-event-conf | 6 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-ssl-conf | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-worker-conf | 6 |
4 files changed, 2 insertions, 20 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf index 6c80e1a28f..085e2c6fa3 100755 --- a/sca-cpp/trunk/modules/http/httpd-conf +++ b/sca-cpp/trunk/modules/http/httpd-conf @@ -181,17 +181,11 @@ cat >$root/conf/mpm.conf <<EOF # Generated by: httpd-conf $* LoadModule mpm_prefork_module ${modules_prefix}/modules/mod_mpm_prefork.so -EOF - -uname=`uname -s` -if [ $uname = "Darwin" ]; then - cat >>$root/conf/mpm.conf <<EOF # Generated by: httpd-conf $* # Set thread stack size ThreadStackSize 2097152 EOF -fi # Generate modules list cat >$root/conf/modules.conf <<EOF diff --git a/sca-cpp/trunk/modules/http/httpd-event-conf b/sca-cpp/trunk/modules/http/httpd-event-conf index e4c89356db..a7cab03bc6 100755 --- a/sca-cpp/trunk/modules/http/httpd-event-conf +++ b/sca-cpp/trunk/modules/http/httpd-event-conf @@ -31,15 +31,9 @@ cat >$root/conf/mpm.conf <<EOF # Use HTTPD event MPM LoadModule mpm_event_module ${modules_prefix}/modules/mod_mpm_event.so -EOF - -uname=`uname -s` -if [ $uname = "Darwin" ]; then - cat >>$root/conf/mpm.conf <<EOF # Generated by: httpd-event-conf $* # Set thread stack size ThreadStackSize 2097152 EOF -fi diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf index 9de67ff716..9567c44cf1 100755 --- a/sca-cpp/trunk/modules/http/httpd-ssl-conf +++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf @@ -156,8 +156,8 @@ Include conf/vhost-ssl.conf # Declare SSL certificates used in this virtual host SSLCACertificateFile "$root/cert/ca.crt" SSLCertificateChainFile "$root/cert/ca.crt" -SSLCertificateFile "$root/cert/vhost.crt" -SSLCertificateKeyFile "$root/cert/vhost.key" +SSLCertificateFile "$root/cert/server.crt" +SSLCertificateKeyFile "$root/cert/server.key" # Declare proxy SSL client certificates SSLProxyCACertificateFile "$root/cert/ca.crt" diff --git a/sca-cpp/trunk/modules/http/httpd-worker-conf b/sca-cpp/trunk/modules/http/httpd-worker-conf index 74299085d8..84fe6b4a54 100755 --- a/sca-cpp/trunk/modules/http/httpd-worker-conf +++ b/sca-cpp/trunk/modules/http/httpd-worker-conf @@ -31,15 +31,9 @@ cat >$root/conf/mpm.conf <<EOF # Use HTTPD worker MPM LoadModule mpm_worker_module ${modules_prefix}/modules/mod_mpm_worker.so -EOF - -uname=`uname -s` -if [ $uname = "Darwin" ]; then - cat >>$root/conf/mpm.conf <<EOF # Generated by: httpd-event-conf $* # Set thread stack size ThreadStackSize 2097152 EOF -fi |