From 237975e7817d9a88634b5d20528adbe859764103 Mon Sep 17 00:00:00 2001
From: Piotr Skindel <piotr.skindel@intel.com>
Date: Fri, 15 Jan 2016 15:15:10 +0100
Subject: [PATCH] Added new var 'CAPTCHA_ENABLED_

Added tip for answering the enable captcha question

Removed debugging git checkout

Fixed code indentation
---
 configure.sh |  3 ++-
 installer.sh | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 configure.sh
 mode change 100755 => 100644 installer.sh

diff --git a/configure.sh b/configure.sh
old mode 100755
new mode 100644
index b8061df..41bd12f
--- a/configure.sh
+++ b/configure.sh
@@ -133,7 +133,8 @@ do
   setup_field "RULE_ENGINE_SERVICE_USERNAME" "rule_engine@example.com" 
   setup_field "RULE_ENGINE_SERVICE_PASSWORD" $(random_password)
   
-  write_section "GOOGLE CAPTCHA CREDENTIALS"
+  write_section "GOOGLE CAPTCHA CONFIGURATION"
+  setup_field "CAPTCHA_ENABLED" "false" "enable Google reCAPTCHA? (true-yes, false-no)"
   setup_field "CAPTCHA_CREDENTIALS_SITE_KEY" "" "google Captcha site key"
   setup_field "CAPTCHA_CREDENTIALS_SECRET_KEY" "" "google Captcha secret key"
  
diff --git a/installer.sh b/installer.sh
old mode 100755
new mode 100644
index f7c853c..3099c1a
--- a/installer.sh
+++ b/installer.sh
@@ -199,18 +199,18 @@ function provide_dashboard_security_credentials {
 }
 
 function provide_captcha_credentials {
-	CAPTCHA_CREDENTIALS="{\"siteKey\":\"${CAPTCHA_CREDENTIALS_SITE_KEY}\",\"secretKey\":\"${CAPTCHA_CREDENTIALS_SECRET_KEY}\"}"
-  EXISTS=$(check_service_exists recaptcha-ups)
-  if [ $EXISTS -eq 0 ]
-  then
-    echo "Creating recaptcha-ups $CAPTCHA_CREDENTIALS"
-    RETURN=($(cf cups recaptcha-ups -p ${CAPTCHA_CREDENTIALS}))
-  else
-    echo "Updating recaptcha-ups $CAPTCHA_CREDENTIALS"
-    RETURN=($(cf uups recaptcha-ups -p ${CAPTCHA_CREDENTIALS}))
-  fi
-  
-  check_return
+	CAPTCHA_CREDENTIALS="{\"siteKey\":\"${CAPTCHA_CREDENTIALS_SITE_KEY}\",\"secretKey\":\"${CAPTCHA_CREDENTIALS_SECRET_KEY}\",\"enabled\":\"${CAPTCHA_ENABLED}\"}"
+	EXISTS=$(check_service_exists recaptcha-ups)
+	if [ $EXISTS -eq 0 ]
+	then
+		echo "Creating recaptcha-ups $CAPTCHA_CREDENTIALS"
+		RETURN=($(cf cups recaptcha-ups -p ${CAPTCHA_CREDENTIALS}))
+	else
+		echo "Updating recaptcha-ups $CAPTCHA_CREDENTIALS"
+		RETURN=($(cf uups recaptcha-ups -p ${CAPTCHA_CREDENTIALS}))
+	fi
+
+	check_return
 }
 
 function deploy_backend {