diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-11-30 03:46:48 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-11-30 03:46:48 +0000 |
commit | d59fdfce0fb7822f55cd39cdf5f3c55e92e2a53f (patch) | |
tree | 57d23f07e0e7270209046b5ee88db23ef925f7f6 /sca-cpp/trunk/modules/edit/ssl-start | |
parent | cbb821713a2b00229ed4eb1c7f2b2d8ec75d6f50 (diff) |
Enable log collection using Scribe, and some minor log cleanup.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1208240 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/edit/ssl-start')
-rwxr-xr-x | sca-cpp/trunk/modules/edit/ssl-start | 66 |
1 files changed, 54 insertions, 12 deletions
diff --git a/sca-cpp/trunk/modules/edit/ssl-start b/sca-cpp/trunk/modules/edit/ssl-start index 5103566a5c..015a5dda66 100755 --- a/sca-cpp/trunk/modules/edit/ssl-start +++ b/sca-cpp/trunk/modules/edit/ssl-start @@ -27,6 +27,18 @@ jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python` ../../modules/http/ssl-ca-conf tmp sca-store.com ../../modules/http/ssl-cert-conf tmp sca-store.com server +# Configure and start logging +if [ -x ../../components/log/scribe-cat ]; then + ../../components/log/scribed-central-conf tmp + ../../components/log/scribed-client-conf tmp localhost + ../../components/log/scribed-central-start tmp + ../../components/log/scribed-client-start tmp +fi + +# Start memcached +../../components/cache/memcached-start 11211 +../../components/cache/memcached-start 11212 + # Configure server ../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs ../../modules/http/httpd-event-conf tmp @@ -41,21 +53,21 @@ jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python` # Configure OAuth authentication # Configure your OAuth app keys here ../../modules/oauth/oauth-conf tmp -../../modules/oauth/oauth-memcached-conf tmp sca-store.com 11212 +../../modules/oauth/oauth-memcached-conf tmp localhost 11212 ../../modules/oauth/oauth2-appkey-conf tmp facebook.com 12345 67890 # Configure OpenID step2 authentication ../../modules/openid/openid-conf tmp ../../modules/openid/openid-step2-conf tmp -../../modules/openid/openid-memcached-conf tmp sca-store.com 11212 +../../modules/openid/openid-memcached-conf tmp localhost 11212 # Configure authorized users #../../modules/http/group-auth-conf tmp john #../../modules/http/group-auth-conf tmp jane #../../modules/http/group-auth-conf tmp admin -# Configure your OpenID and OAuth ids here -../../modules/http/group-auth-conf tmp https://www.google.com/accounts/o8/id?id=45678 -../../modules/http/group-auth-conf tmp 23456789 +# Configure the email addresses associated with your OpenID and OAuth ids here +../../modules/http/group-auth-conf tmp john@sca-store.com +../../modules/http/group-auth-conf tmp jane@sca-store.com # Configure mod-security ../../modules/http/mod-security-conf tmp @@ -64,8 +76,42 @@ jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python` ../../modules/server/server-conf tmp ../../modules/python/python-conf tmp +# Configure server log streaming +if [ -x ../../components/log/scribe-cat ]; then + cat >tmp/conf/log.conf <<EOF +# Generated by: ssl-start $* +ErrorLog "|$here/../../components/log/scribe-cat server" +CustomLog "|$here/../../components/log/scribe-cat server" combined + +EOF + + cat >tmp/conf/log-ssl.conf <<EOF +# Generated by: ssl-start $* +CustomLog "|$here/../../components/log/scribe-cat server" sslcombined + +EOF + + cat >tmp/conf/mod-security-log.conf <<EOF +# Generated by: ssl-start $* +SecAuditLog "|$here/../../components/log/scribe-cat secaudit" + +EOF + +fi + +# Configure certificate mime type +cat >>tmp/conf/svhost-ssl.conf <<EOF +# Generated by: ssl-start $* +# Certificate mime type +<Location /ca.crt> +ForceType application/x-x509-ca-cert +</Location> + +EOF + # Configure error pages cat >>tmp/conf/svhost-ssl.conf <<EOF +# Generated by: ssl-start $* # Error pages ErrorDocument 404 /public/notfound/ ErrorDocument 401 /public/notauth/ @@ -76,7 +122,7 @@ EOF # Configure SCA contributions cat >>tmp/conf/httpd.conf <<EOF - +# Generated by: ssl-start $* # Configure SCA Composite SCAContribution `pwd`/ SCAComposite edit.composite @@ -89,7 +135,7 @@ EOF # Configure resource aliases cat >>tmp/conf/httpd.conf <<EOF - +# Generated by: ssl-start $* Alias /home/home.png $here/htdocs/home/home.png Alias /home/home.b64 $here/htdocs/home/home.b64 @@ -100,7 +146,7 @@ EOF # Configure app resource aliases cat >>tmp/conf/svhost-ssl.conf <<EOF - +# Generated by: ssl-start $* <Location /v> RewriteEngine on @@ -119,10 +165,6 @@ EOF # Create application database directories mkdir -p tmp/appdata/filedb -# Start memcached -../../components/cache/memcached-start 11211 -../../components/cache/memcached-start 11212 - # Start server ../../modules/http/httpd-start tmp |