From 5ada4c69224af423b687e08de1e86e27cc201f75 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 11 Dec 2015 21:09:04 +0530
Subject: [PATCH] substitute `OAUTH_GOOGLE_APPROVAL_PROMPT`,
 `OAUTH_GITHUB_SCOPE` and `OAUTH_GITLAB_SCOPE` using `replace_placeholders`

---
 assets/runtime/env-defaults | 3 +++
 assets/runtime/functions    | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index a003cb2f..3e940440 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -203,6 +203,7 @@ OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
 ### GOOGLE
 OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY:-}
 OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET:-}
+OAUTH_GOOGLE_APPROVAL_PROMPT=${OAUTH_GOOGLE_APPROVAL_PROMPT:-}
 
 ### FACEBOOK
 OAUTH_FACEBOOK_API_KEY=${OAUTH_FACEBOOK_API_KEY:-}
@@ -215,10 +216,12 @@ OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET:-}
 ### GITHUB
 OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY:-}
 OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET:-}
+OAUTH_GITHUB_SCOPE=${OAUTH_GITHUB_SCOPE:-user:email}
 
 ### GITLAB
 OAUTH_GITLAB_API_KEY=${OAUTH_GITLAB_API_KEY:-}
 OAUTH_GITLAB_APP_SECRET=${OAUTH_GITLAB_APP_SECRET:-}
+OAUTH_GITLAB_SCOPE=${OAUTH_GITLAB_SCOPE:-api}
 
 ### BITBUCKET
 OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index f74709d8..72b07e71 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -335,8 +335,7 @@ gitlab_configure_oauth_google() {
     echo "Configuring gitlab::oauth::google..."
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     replace_placeholders ${GITLAB_CONFIG} \
-      OAUTH_GOOGLE_API_KEY OAUTH_GOOGLE_APP_SECRET OAUTH_GOOGLE_RESTRICT_DOMAIN
-    exec_as_git sed -i 's|{{OAUTH_GOOGLE_APPROVAL_PROMPT}}||' ${GITLAB_INSTALL_DIR}/config/gitlab.yml
+      OAUTH_GOOGLE_API_KEY OAUTH_GOOGLE_APP_SECRET OAUTH_GOOGLE_RESTRICT_DOMAIN OAUTH_GOOGLE_APPROVAL_PROMPT
   else
     exec_as_git sed -i "/name: 'google_oauth2'/,/{{OAUTH_GOOGLE_RESTRICT_DOMAIN}}/d" ${GITLAB_CONFIG}
   fi
@@ -369,8 +368,7 @@ gitlab_configure_oauth_github() {
     echo "Configuring gitlab::oauth::github..."
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     replace_placeholders ${GITLAB_CONFIG} \
-      OAUTH_GITHUB_API_KEY OAUTH_GITHUB_APP_SECRET
-    exec_as_git sed -i 's|{{OAUTH_GITHUB_SCOPE}}|user:email|' ${GITLAB_INSTALL_DIR}/config/gitlab.yml
+      OAUTH_GITHUB_API_KEY OAUTH_GITHUB_APP_SECRET OAUTH_GITHUB_SCOPE
   else
     exec_as_git sed -i "/name: 'github'/,/{{OAUTH_GITHUB_SCOPE}}/d" ${GITLAB_CONFIG}
   fi
@@ -381,8 +379,7 @@ gitlab_configure_oauth_gitlab() {
     echo "Configuring gitlab::oauth::gitlab..."
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     replace_placeholders ${GITLAB_CONFIG} \
-      OAUTH_GITLAB_API_KEY OAUTH_GITLAB_APP_SECRET
-    exec_as_git sed -i 's|{{OAUTH_GITLAB_SCOPE}}|api|' ${GITLAB_INSTALL_DIR}/config/gitlab.yml
+      OAUTH_GITLAB_API_KEY OAUTH_GITLAB_APP_SECRET OAUTH_GITLAB_SCOPE
   else
     exec_as_git sed -i "/name: 'gitlab'/,/{{OAUTH_GITLAB_SCOPE}}/d" ${GITLAB_CONFIG}
   fi