diff options
Diffstat (limited to 'sca-cpp/trunk/modules/server/server-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/server/server-conf | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf index 4a318c6fce..7c72233ca9 100755 --- a/sca-cpp/trunk/modules/server/server-conf +++ b/sca-cpp/trunk/modules/server/server-conf @@ -57,27 +57,11 @@ ssl=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"` if [ "$ssl" != "" ]; then cat >>$root/conf/httpd.conf <<EOF # Configure SSL certificates -SCAWiringSSLCACertificateFile "$root/conf/ca.crt" -SCAWiringSSLCertificateFile "$root/conf/server.crt" -SCAWiringSSLCertificateKeyFile "$root/conf/server.key" +SCAWiringSSLCACertificateFile "$root/cert/ca.crt" +SCAWiringSSLCertificateFile "$root/cert/server.crt" +SCAWiringSSLCertificateKeyFile "$root/cert/server.key" EOF fi -vhost=`cat $root/conf/httpd.conf | grep VirtualDocumentRoot` -proxy=`cat $root/conf/httpd.conf | grep ProxyPass` - -vhost=`cat $root/conf/httpd.conf | grep "# Generated by: vhost-conf"` -if [ "$vhost" != "" ]; then - proxy=`cat $root/conf/httpd.conf | grep "# Generated by: proxy-conf"` - if [ "$proxy" = "" ]; then - cat >>$root/conf/httpd.conf <<EOF -# Isolate requests from different virtual hosts -MaxRequestsPerChild 1 - -EOF - - fi -fi - |