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