diff options
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-ssl-conf | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/server/server-conf | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf index ef4c0c1a71..c52d1cc9eb 100755 --- a/sca-cpp/trunk/modules/http/httpd-ssl-conf +++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf @@ -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 diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf index a31052af7a..ed5ead4cf5 100755 --- a/sca-cpp/trunk/modules/server/server-conf +++ b/sca-cpp/trunk/modules/server/server-conf @@ -26,6 +26,15 @@ port=`cat $root/conf/httpd.conf | grep Listen | tail -1 | awk '{ print $2 }'` 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 |