Update templates to support use of master configuration.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
kjetilhp · Jul 29, 2015 · db44349 · db44349
1 parent d78024c
commit db44349
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 21 deletions.
diff --git a/templates/activation.sh b/templates/activation.sh
@@ -3,6 +3,6 @@ cat <<EOF2
 DEBUG=*
 USVC_CONFIG_ENV=docker
 NODE_ENV=development
-usvc_rpcService_signing_secret=NefofvigdadEjlien8Schyk8
-usvc_amqp_url=amqp://admin:ofjoHyibkaibHiammagsenun@rabbit:5672
+usvc_rpcService_signing_secret=${NINJA_SIGNING_SECRET}
+usvc_amqp_url=amqp://admin:${NINJA_RABBIT_SECRET}@rabbit:5672
 EOF2
diff --git a/templates/apiservice.sh b/templates/apiservice.sh
@@ -3,14 +3,13 @@ cat <<EOF2
 DEBUG=*
 USVC_CONFIG_ENV=docker
 NODE_ENV=development
-usvc_amqp_url=amqp://admin:ofjoHyibkaibHiammagsenun@rabbit:5672
-usvc_rpcService_signing_secret=NefofvigdadEjlien8Schyk8
-usvc_activationService_signing_secret=NefofvigdadEjlien8Schyk8
-usvc_modelStoreService_signing_secret=NefofvigdadEjlien8Schyk8
-usvc_sessions_secret=OjIakHisvaykafmoafOabFey
-usvc_oauth_callbackURL=https://apiservice.example.com/auth/ninja/callback
-usvc_oauth_authorizationURL=https://douitsu.example.com/dialog/authorize
-usvc_oauth_clientID=app_XX
-usvc_oauth_clientSecret=sk_XX
-usvc_sessions_secret=EcBetvabdigobejBararuch2
+usvc_amqp_url=amqp://admin:${NINJA_RABBIT_SECRET}@rabbit:5672
+usvc_rpcService_signing_secret=${NINJA_SIGNING_SECRET}
+usvc_activationService_signing_secret=${NINJA_SIGNING_SECRET}
+usvc_modelStoreService_signing_secret=${NINJA_SIGNING_SECRET}
+usvc_sessions_secret=${NINJA_SESSION_SECRET}
+usvc_oauth_callbackURL=https://${NINJA_API_ENDPOINT}/auth/ninja/callback
+usvc_oauth_authorizationURL=https://${NINJA_ID_ENDPOINT}/dialog/authorize
+usvc_oauth_clientID=${NINJA_APP_TOKEN}
+usvc_oauth_clientSecret=${NINJA_APP_KEY}
 EOF2
diff --git a/templates/modelservice.sh b/templates/modelservice.sh
@@ -3,5 +3,5 @@ cat <<EOF2
 DEBUG=*
 USVC_CONFIG_ENV=docker
 NODE_ENV=development
-usvc_rpcService_signing_secret=NefofvigdadEjlien8Schyk8
+usvc_rpcService_signing_secret=${NINJA_SIGNING_SECRET}
 EOF2
diff --git a/templates/mqttproxy.sh b/templates/mqttproxy.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 cat <<EOF2
 BACKEND_USER=admin
-BACKEND_PASS=ofjoHyibkaibHiammagsenun
+BACKEND_PASS=${NINJA_RABBIT_SECRET}
 EOF2
diff --git a/templates/rpcservice.sh b/templates/rpcservice.sh
@@ -3,6 +3,6 @@ cat <<EOF2
 DEBUG=*
 USVC_CONFIG_ENV=docker
 NODE_ENV=development
-usvc_amqp_url=amqp://admin:ofjoHyibkaibHiammagsenun@rabbit:5672
-usvc_modelStoreService_signing_secret=NefofvigdadEjlien8Schyk8
+usvc_amqp_url=amqp://admin:${NINJA_RABBIT_SECRET}@rabbit:5672
+usvc_modelStoreService_signing_secret=${NINJA_SIGNING_SECRET}
 EOF2
diff --git a/templates/spherecouch.sh b/templates/spherecouch.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 cat <<EOF2
-
 EOF2
diff --git a/templates/spherehaproxy.sh b/templates/spherehaproxy.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 cat <<EOF2
-
 EOF2
diff --git a/templates/sphererabbit.sh b/templates/sphererabbit.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 cat <<EOF2
-RABBITMQ_PASS=ofjoHyibkaibHiammagsenun
+RABBITMQ_PASS=${NINJA_RABBIT_SECRET}
 EOF2
diff --git a/templates/sphereredis.sh b/templates/sphereredis.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 cat <<EOF2
-
 EOF2
diff --git a/templates/stateservice.sh b/templates/stateservice.sh
@@ -2,5 +2,5 @@
 cat <<EOF2
 DEBUG=true
 REDIS_URL=redis://redis:6379
-RABBIT_URL=amqp://admin:ofjoHyibkaibHiammagsenun@rabbit:5672
+RABBIT_URL=amqp://admin:${NINJA_RABBIT_SECRET}@rabbit:5672
 EOF2