svn commit: r928608 - in /tuscany/sca-cpp/trunk/modules: http/httpd-ssl-conf server/server-conf

[js...@apache.org]

Author: jsdelfino
Date: Mon Mar 29 06:47:37 2010
New Revision: 928608

URL: http://svn.apache.org/viewvc?rev=928608&view=rev
Log:
Move SCA runtime SSL config from httpd-ssl-conf to server-conf, as it only applies to servers running the SCA runtime.

Modified:
    tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
    tuscany/sca-cpp/trunk/modules/server/server-conf

Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=928608&r1=928607&r2=928608&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Mon Mar 29 06:47:37 2010
@@ -84,11 +84,6 @@ Require valid-user
 
 </VirtualHost>
 
-# Configure SCA SSL support
-SCASSLCACertificateFile "$root/conf/ca.crt"
-SCASSLCertificateFile "$root/conf/server.crt"
-SCASSLCertificateKeyFile "$root/conf/server.key"
-
 EOF
 
 # Create test users for HTTP basic authentication

Modified: tuscany/sca-cpp/trunk/modules/server/server-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-conf?rev=928608&r1=928607&r2=928608&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-conf Mon Mar 29 06:47:37 2010
@@ -26,6 +26,15 @@ port=`cat $root/conf/httpd.conf | grep L
 ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'`
 if [ "$ssl" = "on" ]; then
     protocol="https"
+
+cat >>$root/conf/httpd.conf <<EOF
+# Configure SCA SSL support
+SCASSLCACertificateFile "$root/conf/ca.crt"
+SCASSLCertificateFile "$root/conf/server.crt"
+SCASSLCertificateKeyFile "$root/conf/server.key"
+
+EOF
+
 else
     protocol="http"
 fi