Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 95812 invoked from network); 2 Aug 2010 01:44:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Aug 2010 01:44:21 -0000 Received: (qmail 48922 invoked by uid 500); 2 Aug 2010 01:44:21 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 48853 invoked by uid 500); 2 Aug 2010 01:44:20 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 48846 invoked by uid 99); 2 Aug 2010 01:44:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Aug 2010 01:44:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Aug 2010 01:44:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 00EC8238897D; Mon, 2 Aug 2010 01:43:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r981352 - in /tuscany/sca-cpp/trunk: modules/http/ modules/openid/ modules/server/ samples/store-cluster/ samples/store-cluster/htdocs/domains/jane/login/ samples/store-cluster/htdocs/domains/jane/logout/ samples/store-cluster/htdocs/domain... Date: Mon, 02 Aug 2010 01:43:00 -0000 To: commits@tuscany.apache.org From: jsdelfino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100802014301.00EC8238897D@eris.apache.org> Author: jsdelfino Date: Mon Aug 2 01:42:59 2010 New Revision: 981352 URL: http://svn.apache.org/viewvc?rev=981352&view=rev Log: Fix HTTPS config scripts to enable SSL certicates, HTTP basic auth, and OpenID to coexist. Add OpenID support to sample. Added: tuscany/sca-cpp/trunk/modules/http/httpd-auth-conf - copied, changed from r980010, tuscany/sca-cpp/trunk/modules/http/vhost-conf tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am tuscany/sca-cpp/trunk/modules/http/httpd-conf tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf tuscany/sca-cpp/trunk/modules/http/proxy-conf tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf tuscany/sca-cpp/trunk/modules/http/proxy-ssl-member-conf tuscany/sca-cpp/trunk/modules/http/ssl-ca-conf tuscany/sca-cpp/trunk/modules/http/ssl-cert-conf tuscany/sca-cpp/trunk/modules/http/vhost-conf tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf tuscany/sca-cpp/trunk/modules/openid/Makefile.am tuscany/sca-cpp/trunk/modules/openid/openid-conf tuscany/sca-cpp/trunk/modules/openid/start-test tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start tuscany/sca-cpp/trunk/samples/store-python/ssl-start Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Mon Aug 2 01:42:59 2010 @@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE} incl_HEADERS = *.hpp incldir = $(prefix)/include/modules/http -dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf httpd-ssl-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf +dist_mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf httpd-ssl-conf httpd-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf moddir=$(prefix)/modules/http curl_test_SOURCES = curl-test.cpp Copied: tuscany/sca-cpp/trunk/modules/http/httpd-auth-conf (from r980010, tuscany/sca-cpp/trunk/modules/http/vhost-conf) URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-auth-conf?p2=tuscany/sca-cpp/trunk/modules/http/httpd-auth-conf&p1=tuscany/sca-cpp/trunk/modules/http/vhost-conf&r1=980010&r2=981352&rev=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/vhost-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/httpd-auth-conf Mon Aug 2 01:42:59 2010 @@ -17,31 +17,30 @@ # specific language governing permissions and limitations # under the License. -# Generate mass dynamic virtual hosting configuration +# Generate a minimal HTTPD SSL configuration here=`readlink -f $0`; here=`dirname $here` root=`readlink -f $1` conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` -port=`echo $conf | awk '{ print $7 }' | awk -F "/" '{ print $1 }'` -pport=`echo $conf | awk '{ print $7 }' | awk -F "/" '{ print $2 }'` -if [ "$pport" = "" ]; then - pport=$port -fi -htdocs=`echo $conf | awk '{ print $8 }'` -htdocs=`readlink -f $htdocs` +httpd_prefix=`cat $here/httpd.prefix` -cat >>$root/conf/httpd.conf < -ServerName http://vhost.$host:$pport -ServerAlias *.$host -VirtualDocumentRoot $htdocs/domains/%1/ - -Include conf/dvhost.conf - +# Generate basic authentication configuration +cat >>$root/conf/vhost-ssl.conf < +AuthType Basic +AuthName "$host" +AuthUserFile "$root/conf/httpd.passwd" +Require valid-user + EOF +# Create test users +$httpd_prefix/bin/htpasswd -bc $root/conf/httpd.passwd test test 2>/dev/null +$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd admin admin 2>/dev/null +$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null +$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null + Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Mon Aug 2 01:42:59 2010 @@ -44,7 +44,9 @@ cat >$root/conf/httpd.conf < LoadModule log_config_module ${modules_prefix}/modules/mod_log_config.so @@ -80,17 +83,17 @@ Timeout 45 LimitRequestBody 1048576 HostNameLookups Off -# Logging +# Log HTTP requests +LogLevel info ErrorLog $root/logs/error_log LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined CustomLog $root/logs/access_log combined -LogLevel warn # Configure Mime types DefaultType text/plain TypesConfig $here/conf/mime.types -# Set document root +# Set default document root DocumentRoot $htdocs DirectoryIndex index.html @@ -113,16 +116,17 @@ Options FollowSymLinks Allow from all -# Allow access to service components +# Allow access to root location Options FollowSymLinks Order deny,allow Allow from all -# Setup HTTP virtual host +# Listen on HTTP port Listen $port +# Setup HTTP virtual host ServerName http://$host:$pport 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=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Mon Aug 2 01:42:59 2010 @@ -45,7 +45,7 @@ RewriteCond %{SERVER_PORT} !^$sslpport$ RewriteRule .* https://%{SERVER_NAME}:$sslpport%{REQUEST_URI} [R,L] -# Setup SSL support +# Configure SSL support AddType application/x-x509-ca-cert .crt AddType application/x-pkcs7-crl .crl SSLPassPhraseDialog builtin @@ -55,19 +55,19 @@ SSLMutex "file:$root/logs/ssl_mutex" SSLRandomSeed startup builtin SSLRandomSeed connect builtin -# Setup HTTPS virtual host +# Listen on HTTPS port Listen $sslport +# HTTPS virtual host ServerName https://$host:$sslpport -Include conf/ssl-svhost.conf +Include conf/svhost-ssl.conf # Allow the server admin to view the server status SetHandler server-status HostnameLookups on -Deny from All Allow from all Require user admin @@ -80,7 +80,7 @@ ExtendedStatus On EOF # Generate HTTPS vhost configuration -cat >$root/conf/ssl-vhost.conf <$root/conf/vhost-ssl.conf <s %b \"%{Referer}i\" \"%{User-agent}i\"" sslcombined +# Verify client certificates +SSLVerifyClient optional +SSLVerifyDepth 1 + +# Log SSL requests +#CustomLog "$root/logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" +LogFormat "%h %l %u %t %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" \"%{SSL_CLIENT_I_DN}x\" \"%{SSL_CLIENT_S_DN}x\"" sslcombined CustomLog $root/logs/ssl_access_log sslcombined -LogLevel warn -# Require clients to present either: -# a certificate signed with our certification authority certificate -# or a userid + password for HTTP basic authentication +EOF + +# Generate HTTPS authentication requirement +cat >>$root/conf/vhost-ssl.conf < +# Require clients to use SSL and authenticate +SSLRequireSSL + +# Also accept other forms of authentication (e.g. HTTP basic +# authentication, or OpenID authentication) Satisfy Any -SSLVerifyClient optional -SSLVerifyDepth 1 -SSLOptions +FakeBasicAuth -SSLRequireSSL -SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 and %{SSL_CLIENT_I_DN_O} == "$org" +EOF + +proxyconf=`cat $root/conf/vhost.conf | grep "# Generated by: proxy-conf"` +if [ "$proxyconf" != "" ]; then + cat >>$root/conf/vhost-ssl.conf <= 128 + +# Forward received SSL client certificate info in proxied requests +RewriteEngine on +RewriteRule .* - [E=SSL_PROTOCOL:%{SSL:SSL_PROTOCOL}] +RewriteRule .* - [E=SSL_CIPHER:%{SSL:SSL_CIPHER}] +RewriteCond %{SSL:SSL_CLIENT_I_DN} !="" +RewriteRule .* - [E=SSL_I_DN:%{SSL:SSL_CLIENT_I_DN}] +RewriteCond %{SSL:SSL_CLIENT_S_DN} !="" +RewriteRule .* - [E=SSL_S_DN:%{SSL:SSL_CLIENT_S_DN}] +RewriteCond %{SSL:SSL_CLIENT_I_DN_O} !="" +RewriteRule .* - [E=SSL_I_DN_O:%{SSL:SSL_CLIENT_I_DN_O}] +RewriteCond %{SSL:SSL_CLIENT_S_DN_OU} !="" +RewriteRule .* - [E=SSL_S_DN_OU:%{SSL:SSL_CLIENT_S_DN_OU}] +RequestHeader unset X-Forwarded-SSL-Protocol +RequestHeader unset X-Forwarded-SSL-Cipher +RequestHeader unset X-Forwarded-SSL-Issuer-DN +RequestHeader unset X-Forwarded-SSL-Client-DN +RequestHeader unset X-Forwarded-SSL-Issuer-DN-O +RequestHeader unset X-Forwarded-SSL-Client-DN-OU +RequestHeader set X-Forwarded-SSL-Protocol %{SSL_PROTOCOL}e env=SSL_PROTOCOL +RequestHeader set X-Forwarded-SSL-Cipher %{SSL_CIPHER}e env=SSL_CIPHER +RequestHeader set X-Forwarded-SSL-Issuer-DN %{SSL_I_DN}e env=SSL_I_DN +RequestHeader set X-Forwarded-SSL-Client-DN %{SSL_S_DN}e env=SSL_S_DN +RequestHeader set X-Forwarded-SSL-Issuer-DN-O %{SSL_I_DN_O}e env=SSL_I_DN_O +RequestHeader set X-Forwarded-SSL-Client-DN-OU %{SSL_S_DN_OU}e env=SSL_S_DN_OU + +EOF +else + cat >>$root/conf/vhost-ssl.conf <= 128 and ( \ +( %{SSL_CLIENT_I_DN_O} == "$org" and %{SSL_CLIENT_S_DN_OU} == "server" ) or \ +( %{SSL_CLIENT_I_DN_O} == "$org" and %{SSL_CLIENT_S_DN_OU} == "proxy" and \ + %{HTTP:X-Forwarded-SSL-Issuer-DN-O} == "$org" and %{HTTP:X-Forwarded-SSL-Client-DN-OU} == "server" ) or \ +%{REQUEST_URI} =~ m/^.(login|logout|openid|unprotected).*$/ ) + +# Record received SSL client certificate info in environment vars +RewriteEngine on +RewriteRule .* - [E=SSL_PROTOCOL:%{SSL:SSL_PROTOCOL}] +RewriteRule .* - [E=SSL_CIPHER:%{SSL:SSL_CIPHER}] +RewriteCond %{SSL:SSL_CLIENT_I_DN} !="" +RewriteRule .* - [E=SSL_I_DN:%{SSL:SSL_CLIENT_I_DN}] +RewriteCond %{SSL:SSL_CLIENT_S_DN} !="" +RewriteRule .* - [E=SSL_S_DN:%{SSL:SSL_CLIENT_S_DN}] + +# Store the client certificate DN in the SSL_REMOTE_USER var, +# that's similar to the SSLUserName directive but more flexible as +# it can pick a client certificate DN forwarded by a proxy +RewriteCond %{SSL:SSL_CLIENT_I_DN_O} "$org" +RewriteCond %{SSL:SSL_CLIENT_S_DN_OU} "server" +RewriteRule .* - [E=SSL_REMOTE_USER:%{SSL:SSL_CLIENT_S_DN}] + +RewriteCond %{SSL:SSL_CLIENT_I_DN_O} "$org" +RewriteCond %{SSL:SSL_CLIENT_S_DN_OU} "proxy" +RewriteCond %{HTTP:X-Forwarded-SSL-Issuer-DN-O} "$org" +RewriteCond %{HTTP:X-Forwarded-SSL-Client-DN-OU} "server" +RewriteRule .* - [E=SSL_REMOTE_USER:%{HTTP:X-Forwarded-SSL-Client-DN}] + +EOF +fi -AuthType Basic -AuthName "$host" -AuthUserFile "$root/conf/httpd.passwd" -Require valid-user +cat >>$root/conf/vhost-ssl.conf < EOF -cat >$root/conf/ssl-svhost.conf <$root/conf/svhost-ssl.conf <$root/conf/ssl-dvhost.conf <$root/conf/dvhost-ssl.conf </dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd admin admin 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null - Modified: tuscany/sca-cpp/trunk/modules/http/proxy-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-conf?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/proxy-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/proxy-conf Mon Aug 2 01:42:59 2010 @@ -23,11 +23,12 @@ root=`readlink -f $1` cat >>$root/conf/vhost.conf < Modified: tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/proxy-ssl-conf Mon Aug 2 01:42:59 2010 @@ -21,17 +21,14 @@ here=`readlink -f $0`; here=`dirname $here` root=`readlink -f $1` -cat >>$root/conf/ssl-vhost.conf <>$root/conf/vhost-ssl.conf < -EOF +# Enable SSL proxy engine +SSLProxyEngine on +SSLProxyCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL -cat >>$root/conf/ssl-svhost.conf <>$root/conf/ssl-dvhost.conf <>$root/conf/vhost-ssl.conf <>$root/conf/ssl-vhost.conf <>$root/conf/vhost-ssl.conf <>$root/conf/httpd.conf < Modified: tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf Mon Aug 2 01:42:59 2010 @@ -33,7 +33,7 @@ htdocs=`readlink -f $htdocs` cat >>$root/conf/httpd.conf < EOF Modified: tuscany/sca-cpp/trunk/modules/openid/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/Makefile.am?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/openid/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/openid/Makefile.am Mon Aug 2 01:42:59 2010 @@ -18,7 +18,7 @@ if WANT_OPENID -dist_mod_SCRIPTS = openid-conf +dist_mod_SCRIPTS = openid-conf openid-step2-conf moddir = $(prefix)/modules/openid mod_DATA = openid.prefix Modified: tuscany/sca-cpp/trunk/modules/openid/openid-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/openid-conf?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/openid/openid-conf (original) +++ tuscany/sca-cpp/trunk/modules/openid/openid-conf Mon Aug 2 01:42:59 2010 @@ -20,32 +20,46 @@ # Generate an OpenID server conf here=`readlink -f $0`; here=`dirname $here` root=`readlink -f $1` -openid_prefix=`cat openid.prefix` +conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` +host=`echo $conf | awk '{ print $6 }'` +openid_prefix=`cat $here/openid.prefix` # Configure HTTPD mod_auth_openid module cat >>$root/conf/httpd.conf < +AuthType OpenID AuthOpenIDEnabled On AuthOpenIDCookiePath / AuthOpenIDLoginPage /login AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email - -AuthOpenIDEnabled Off - - +# Enable unauthenticated access to unprotected areas AuthOpenIDEnabled Off - AuthOpenIDEnabled Off + +AuthOpenIDEnabled Off + + +EOF + +cat >>$root/conf/vhost-ssl.conf < +AuthType OpenID +AuthName "$host" +Require valid-user + EOF Modified: tuscany/sca-cpp/trunk/modules/openid/start-test URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/start-test?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/openid/start-test (original) +++ tuscany/sca-cpp/trunk/modules/openid/start-test Mon Aug 2 01:42:59 2010 @@ -18,7 +18,10 @@ # under the License. # Setup +../../modules/http/ssl-ca-conf tmp localhost +../../modules/http/ssl-cert-conf tmp localhost ../../modules/http/httpd-conf tmp localhost 8090 htdocs +../../modules/http/httpd-ssl-conf tmp 8453 ./openid-conf tmp ./openid-step2-conf tmp ../../modules/server/server-conf tmp Modified: tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp (original) +++ tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp Mon Aug 2 01:42:59 2010 @@ -612,8 +612,9 @@ const int postConfigMerge(const ServerCo return OK; ServerConf& sc = httpd::serverConf(s, &mod_tuscany_eval); debug(httpd::serverName(s), "modeval::postConfigMerge::serverName"); - if (sc.wiringServerName == "") sc.wiringServerName = httpd::serverName(s); - debug(httpd::serverName(s), "modeval::postConfigMerge::wiringServerName"); + if (sc.wiringServerName == "") + sc.wiringServerName = mainsc.wiringServerName != ""? mainsc.wiringServerName : httpd::serverName(s); + debug(sc.wiringServerName, "modeval::postConfigMerge::wiringServerName"); sc.contributionPath = mainsc.contributionPath; sc.compositeName = mainsc.compositeName; sc.virtualHostContributionPath = mainsc.virtualHostContributionPath; Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,97 @@ + + +

Sign in with an OpenID provider

+ + + +
+ +
+ +
+

Sign in with your Google account

+

Sign in with your Yahoo account

+

Sign in with your MyOpenID account

+

Sign in with your Verisign account

+

Sign in with a Google apps domain
+
+

+

Sign in with an OpenID endpoint
+
+

+
+ + Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,33 @@ + + + +

Sign out

+ +
+ + +
+ Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,97 @@ + + +

Sign in with an OpenID provider

+ + + +
+ +
+ +
+

Sign in with your Google account

+

Sign in with your Yahoo account

+

Sign in with your MyOpenID account

+

Sign in with your Verisign account

+

Sign in with a Google apps domain
+
+

+

Sign in with an OpenID endpoint
+
+

+
+ + Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,33 @@ + + + +

Sign out

+ +
+ + +
+ Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,97 @@ + + +

Sign in with an OpenID provider

+ + + +
+ +
+ +
+

Sign in with your Google account

+

Sign in with your Yahoo account

+

Sign in with your MyOpenID account

+

Sign in with your Verisign account

+

Sign in with a Google apps domain
+
+

+

Sign in with an OpenID endpoint
+
+

+
+ + Added: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html?rev=981352&view=auto ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html (added) +++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html Mon Aug 2 01:42:59 2010 @@ -0,0 +1,33 @@ + + + +

Sign out

+ +
+ + +
+ Modified: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start?rev=981352&r1=981351&r2=981352&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start (original) +++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start Mon Aug 2 01:42:59 2010 @@ -21,6 +21,7 @@ ../../modules/http/ssl-ca-conf tmp/ssl sca-store.com ../../modules/http/ssl-cert-conf tmp/ssl sca-store.com server ../../modules/http/ssl-cert-conf tmp/ssl *.sca-store.com vhost +../../modules/http/ssl-cert-conf tmp/ssl sca-store.com proxy # Start three identical app servers ../../modules/http/httpd-conf tmp/server1 sca-store.com 8101/80 htdocs @@ -28,6 +29,8 @@ cp `../../modules/http/ssl-ls tmp/ssl` tmp/server1/conf ../../modules/http/httpd-ssl-conf tmp/server1 8441/443 ../../modules/http/vhost-ssl-conf tmp/server1 +../../modules/openid/openid-conf tmp/server1 +../../modules/openid/openid-step2-conf tmp/server1 ../../modules/server/server-conf tmp/server1 ../../modules/python/python-conf tmp/server1 cat >>tmp/server1/conf/httpd.conf <>tmp/server2/conf/httpd.conf <>tmp/server3/conf/httpd.conf <>tmp/conf/httpd.conf <