You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/12/03 04:59:20 UTC
svn commit: r1041681 - in /tuscany/sca-cpp/trunk: modules/http/
modules/oauth/ modules/openid/ samples/store-cluster/ samples/store-cpp/
samples/store-java/ samples/store-nosql/ samples/store-python/
samples/store-scheme/ samples/store-sql/ samples/sto...
Author: jsdelfino
Date: Fri Dec 3 03:59:19 2010
New Revision: 1041681
URL: http://svn.apache.org/viewvc?rev=1041681&view=rev
Log:
Add scripts to support 'Require valid-user' and 'Require group' authz configurations separately.
Added:
tuscany/sca-cpp/trunk/modules/http/group-auth-conf
- copied, changed from r1041680, tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf
tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf
- copied, changed from r1041680, tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
Modified:
tuscany/sca-cpp/trunk/modules/http/Makefile.am
tuscany/sca-cpp/trunk/modules/http/basic-auth-conf
tuscany/sca-cpp/trunk/modules/http/cert-auth-conf
tuscany/sca-cpp/trunk/modules/http/form-auth-conf
tuscany/sca-cpp/trunk/modules/http/httpd-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/modules/http/open-auth-conf
tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf
tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test
tuscany/sca-cpp/trunk/modules/oauth/start-test
tuscany/sca-cpp/trunk/modules/openid/start-test
tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
tuscany/sca-cpp/trunk/samples/store-java/ssl-start
tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start
tuscany/sca-cpp/trunk/samples/store-python/ssl-start
tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
tuscany/sca-cpp/trunk/samples/store-sql/ssl-start
tuscany/sca-cpp/trunk/samples/store-vhost/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=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Fri Dec 3 03:59:19 2010
@@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE}
incl_HEADERS = *.hpp
incldir = $(prefix)/include/modules/http
-dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf
+dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf
moddir=$(prefix)/modules/http
curl_test_SOURCES = curl-test.cpp
Modified: tuscany/sca-cpp/trunk/modules/http/basic-auth-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/basic-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/basic-auth-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/basic-auth-conf Fri Dec 3 03:59:19 2010
@@ -25,8 +25,6 @@ root=`readlink -f $1`
conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
host=`echo $conf | awk '{ print $6 }'`
-httpd_prefix=`cat $here/httpd.prefix`
-
# Generate basic authentication configuration
cat >>$root/conf/auth.conf <<EOF
# Generated by: basic-auth-conf $*
@@ -36,16 +34,8 @@ cat >>$root/conf/auth.conf <<EOF
AuthType Basic
AuthName "$host"
AuthBasicProvider file
-AuthUserFile "$root/conf/httpd.passwd"
Require valid-user
</Location>
EOF
-# Create test users
-touch $root/conf/httpd.passwd
-$httpd_prefix/bin/htpasswd -b $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/cert-auth-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/cert-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/cert-auth-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/cert-auth-conf Fri Dec 3 03:59:19 2010
@@ -25,8 +25,6 @@ root=`readlink -f $1`
conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
host=`echo $conf | awk '{ print $6 }'`
-httpd_prefix=`cat $here/httpd.prefix`
-
# Generate authentication configuration
cat >>$root/conf/auth.conf <<EOF
# Generated by: cert-auth-conf $*
@@ -38,14 +36,12 @@ SSLVerifyDepth 1
AuthType Basic
AuthName "$host"
AuthBasicProvider file
-AuthUserFile "$root/conf/httpd.passwd"
Require valid-user
</Location>
EOF
-# Create certificate-based users
-touch $root/conf/httpd.passwd
+# Create password file and certificate-based users
cat >>$root/conf/httpd.passwd <<EOF
/C=US/ST=CA/L=San Francisco/O=$host/OU=server/CN=$host:\$1\$OXLyS...\$Owx8s2/m9/gfkcRVXzgoE/
/C=US/ST=CA/L=San Francisco/O=$host/OU=proxy/CN=$host:\$1\$OXLyS...\$Owx8s2/m9/gfkcRVXzgoE/
Modified: tuscany/sca-cpp/trunk/modules/http/form-auth-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/form-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/form-auth-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/form-auth-conf Fri Dec 3 03:59:19 2010
@@ -25,8 +25,6 @@ root=`readlink -f $1`
conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
host=`echo $conf | awk '{ print $6 }'`
-httpd_prefix=`cat $here/httpd.prefix`
-
# Generate form authentication configuration
cat >>$root/conf/auth.conf <<EOF
# Generated by: form-auth-conf $*
@@ -36,7 +34,6 @@ cat >>$root/conf/auth.conf <<EOF
AuthType Form
AuthName "$host"
AuthFormProvider file
-AuthUserFile "$root/conf/httpd.passwd"
AuthFormLoginRequiredLocation /login
AuthFormLogoutLocation /
Session On
@@ -55,10 +52,3 @@ SetHandler form-logout-handler
EOF
-# Create test users
-touch $root/conf/httpd.passwd
-$httpd_prefix/bin/htpasswd -b $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
-
Copied: tuscany/sca-cpp/trunk/modules/http/group-auth-conf (from r1041680, tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/group-auth-conf?p2=tuscany/sca-cpp/trunk/modules/http/group-auth-conf&p1=tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf&r1=1041680&r2=1041681&rev=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/group-auth-conf Fri Dec 3 03:59:19 2010
@@ -17,41 +17,28 @@
# specific language governing permissions and limitations
# under the License.
-# Generate an SSL tunnel configuration
here=`readlink -f $0`; here=`dirname $here`
mkdir -p $1
root=`readlink -f $1`
+user=$2
+group="members"
-conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
-host=`echo $conf | awk '{ print $6 }'`
-
-port=`$here/httpd-addr port $2`
-sslhost=$3
-sslport=$4
-tport=$5
-
-httpd_prefix=`cat $here/httpd.prefix`
-
-# Generate HTTPD configuration
-cat >>$root/conf/httpd.conf <<EOF
-# Generated by: tunnel-ssl-conf $*
-# Tunnel TCP/IP traffic over HTTPS
-
-# Listen on local port
-Listen 127.0.0.1:$port
-
-# Tunnel virtual host
-<VirtualHost 127.0.0.1:$port>
-ServerName http://localhost:$port
-
-TunnelPass https://$sslhost:$sslport/tunnel/localhost/$tport
-
-# Declare SSL certificates used in this virtual host
-#TunnelSSLCACertificateFile "$root/cert/ca.crt"
-TunnelSSLCertificateFile "$root/cert/tunnel.crt"
-TunnelSSLCertificateKeyFile "$root/cert/tunnel.key"
-
-</VirtualHost>
+# Add user to group
+cat $root/conf/httpd.groups | awk " BEGIN { found = 0 } /$group: / { printf \"%s %s\n\", \$0, \"$user\"; found = 1 } !/$group: / { printf \"%s\n\", \$0 } END { if (found == 0) printf \"%s: %s\n\", \"$group\", \"$user\" } " >$root/conf/.httpd.groups.tmp 2>/dev/null
+cp $root/conf/.httpd.groups.tmp $root/conf/httpd.groups
+rm $root/conf/.httpd.groups.tmp
+
+# Generate HTTPD group authorization configuration
+conf=`cat $root/conf/auth.conf | grep "Generated by: group-auth-conf"`
+if [ "$conf" = "" ]; then
+ cat >>$root/conf/auth.conf <<EOF
+# Generated by: group-auth-conf $1
+# Allow group member access to root location
+<Location />
+AuthGroupFile "$root/conf/httpd.groups"
+Require group members
+</Location>
EOF
+fi
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Fri Dec 3 03:59:19 2010
@@ -230,11 +230,21 @@ Require all granted
# Allow authorized access to root location
<Location />
Options FollowSymLinks
+AuthUserFile "$root/conf/httpd.passwd"
Require all granted
</Location>
EOF
+# Create password and group files
+cat >$root/conf/httpd.passwd <<EOF
+# Generated by: httpd-conf $*
+EOF
+
+cat >$root/conf/httpd.groups <<EOF
+# Generated by: httpd-conf $*
+EOF
+
# Generate vhost configuration
cat >$root/conf/vhost.conf <<EOF
# Generated by: httpd-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=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Fri Dec 3 03:59:19 2010
@@ -36,8 +36,6 @@ htdocs=`echo $conf | awk '{ print $8 }'`
mkdir -p $htdocs
htdocs=`readlink -f $htdocs`
-httpd_prefix=`cat $here/httpd.prefix`
-
# Extract organization name from our CA certificate
org=`openssl x509 -noout -subject -nameopt multiline -in $root/cert/ca.crt | grep organizationName | awk -F "= " '{ print $2 }'`
Modified: tuscany/sca-cpp/trunk/modules/http/open-auth-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/open-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/open-auth-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/open-auth-conf Fri Dec 3 03:59:19 2010
@@ -25,8 +25,6 @@ root=`readlink -f $1`
conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
host=`echo $conf | awk '{ print $6 }'`
-httpd_prefix=`cat $here/httpd.prefix`
-
# Generate form authentication configuration
cat >>$root/conf/auth.conf <<EOF
# Generated by: open-auth-conf $*
@@ -36,7 +34,6 @@ AuthType Open
AuthName "$host"
AuthOpenAuth On
AuthOpenAuthLoginPage /login
-AuthUserFile "$root/conf/httpd.passwd"
Require valid-user
</Location>
@@ -45,7 +42,6 @@ Require valid-user
AuthType Form
AuthName "$host"
AuthFormProvider file
-AuthUserFile "$root/conf/httpd.passwd"
AuthFormLoginRequiredLocation /login
AuthFormLogoutLocation /
Session On
@@ -57,10 +53,3 @@ SetHandler form-login-handler
EOF
-# Create test users
-touch $root/conf/httpd.passwd
-$httpd_prefix/bin/htpasswd -b $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
-
Copied: tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf (from r1041680, tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf?p2=tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf&p1=tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start&r1=1041680&r2=1041681&rev=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf Fri Dec 3 03:59:19 2010
@@ -17,19 +17,15 @@
# specific language governing permissions and limitations
# under the License.
-../../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
-../../modules/http/basic-auth-conf tmp
-../../modules/server/server-conf tmp
-../../modules/server/cpp-conf tmp
-cat >>tmp/conf/httpd.conf <<EOF
-# Configure SCA Composite
-SCAContribution `pwd`/
-SCAComposite store.composite
+here=`readlink -f $0`; here=`dirname $here`
+mkdir -p $1
+root=`readlink -f $1`
+user=$2
+pass=$3
-EOF
+httpd_prefix=`cat $here/httpd.prefix`
+
+# Create password file
+touch $root/conf/httpd.passwd
+$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd $user $pass 2>/dev/null
-../../components/cache/memcached-start
-../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf Fri Dec 3 03:59:19 2010
@@ -30,8 +30,6 @@ sslhost=$3
sslport=$4
tport=$5
-httpd_prefix=`cat $here/httpd.prefix`
-
# Generate HTTPD configuration
cat >>$root/conf/httpd.conf <<EOF
# Generated by: tunnel-ssl-conf $*
Modified: tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test Fri Dec 3 03:59:19 2010
@@ -45,6 +45,13 @@ here=`readlink -f $0`; here=`dirname $he
../openid/openid-memcached-conf tmp localhost 11213
../http/open-auth-conf tmp
+../http/passwd-auth-conf tmp foo foo
+
+# For this test to work you need to add your form, oauth and open id ids
+# to the authorized user group
+../../modules/http/group-auth-conf tmp foo
+../../modules/http/group-auth-conf tmp 123456
+../../modules/http/group-auth-conf tmp https://www.google.com/accounts/o8/id?id=12345678
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
Modified: tuscany/sca-cpp/trunk/modules/oauth/start-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/start-test?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/start-test (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/start-test Fri Dec 3 03:59:19 2010
@@ -18,6 +18,9 @@
# under the License.
# Setup
+../../ubuntu/ip-redirect-all 80 8090
+../../ubuntu/ip-redirect-all 443 8453
+
../../components/cache/memcached-start 11212
../../components/cache/memcached-start 11213
@@ -36,6 +39,10 @@
./oauth2-appkey-conf tmp facebook.com app1234 secret6789
./oauth2-appkey-conf tmp github.com app5678 secret8901
+# For this test to work you need to add your oauth user id to the
+# authorized user group
+../../modules/http/group-auth-conf tmp 123456
+
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<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=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/start-test (original)
+++ tuscany/sca-cpp/trunk/modules/openid/start-test Fri Dec 3 03:59:19 2010
@@ -31,6 +31,10 @@
./openid-memcached-conf tmp localhost 11213
./openid-step2-conf tmp
+# For this test to work you need to add your openid to the
+# the authorized user group
+../../modules/http/group-auth-conf tmp https://www.google.com/accounts/o8/id?id=1234567
+
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf Fri Dec 3 03:59:19 2010
@@ -41,6 +41,7 @@ tar -C tmp/ssl -c `../../modules/http/ss
../../modules/openid/openid-memcached-conf $root localhost 11212
../../modules/openid/openid-memcached-conf $root localhost 11213
../../modules/http/open-auth-conf $root
+../../modules/http/passwd-auth-conf $root foo foo
../../modules/server/server-conf $root
../../modules/python/python-conf $root
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/server/cpp-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-java/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/java/java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-python/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/open-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-sql/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/ssl-start Fri Dec 3 03:59:19 2010
@@ -22,6 +22,7 @@
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start?rev=1041681&r1=1041680&r2=1041681&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Fri Dec 3 03:59:19 2010
@@ -28,6 +28,7 @@
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/vhost-ssl-conf tmp
../../modules/http/basic-auth-conf tmp
+../../modules/http/passwd-auth-conf tmp foo foo
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF