From 4bf0a7052b448315eda710857acafe24bb112a5b Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 14 Nov 2011 07:10:15 +0000
Subject: Change authentication scheme from Form based auth to OpenID + OAuth.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1201614 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/oauth/oauth-conf | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'sca-cpp/trunk/modules/oauth/oauth-conf')

diff --git a/sca-cpp/trunk/modules/oauth/oauth-conf b/sca-cpp/trunk/modules/oauth/oauth-conf
index 02f81a240b..856eea7f39 100755
--- a/sca-cpp/trunk/modules/oauth/oauth-conf
+++ b/sca-cpp/trunk/modules/oauth/oauth-conf
@@ -41,6 +41,12 @@ LoadModule mod_tuscany_oauth2 $here/libmod_tuscany_oauth2$libsuffix
 
 EOF
 
+cat >$root/cert/oauth-keys.conf <<EOF
+# Generated by: oauth-conf $*
+# OAuth App keys
+
+EOF
+
 cat >>$root/conf/auth.conf <<EOF
 # Generated by: oauth-conf $*
 # Enable OAuth authentication
@@ -54,13 +60,14 @@ Require valid-user
 
 # Configure OAuth App keys
 Include $root/cert/oauth-keys.conf
-Include $HOME/.oauth/*-key.conf
 
 EOF
 
-cat >$root/cert/oauth-keys.conf <<EOF
-# Generated by: oauth-conf $*
-# OAuth App keys
+if [ -d "$HOME/.oauth" ]; then
+    cat >>$root/conf/auth.conf <<EOF
+# Configure OAuth App keys
+Include $HOME/.oauth/*-key.conf
 
 EOF
+fi
 
-- 
cgit v1.2.3