From ec728dbf65e9d3ed2dab2a244323ccfb3ad71a46 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Thu, 22 Jan 2015 22:43:15 -0800
Subject: [PATCH] tls cert and key are part of data

installer has no clue about certs anymore
---
 setup/postinstall/postinstall.sh | 13 +++++--------
 src/updater.js                   |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/setup/postinstall/postinstall.sh b/setup/postinstall/postinstall.sh
index b621c3340..6165abb1b 100755
--- a/setup/postinstall/postinstall.sh
+++ b/setup/postinstall/postinstall.sh
@@ -44,21 +44,19 @@ provision_version=""
 admin_fqdn=""
 admin_origin=""
 
-args=$(getopt -o "" -l "boxversionsurl:,data:,tlscert:,tlskey:,version:" -n "$0" -- "$@")
+args=$(getopt -o "" -l "boxversionsurl:,data:,version:" -n "$0" -- "$@")
 eval set -- "${args}"
 
 while true; do
     case "$1" in
     --boxversionsurl) provision_box_versions_url="$2";;
     --data)
-        read -r provision_app_server_url provision_fqdn provision_token <<EOF
-        $(echo "$2" | $JSON appServerUrl fqdn token | tr '\n' ' ')
+        read -r provision_app_server_url provision_fqdn provision_token provision_tls_cert provision_tls_key <<EOF
+        $(echo "$2" | $JSON appServerUrl fqdn token tlsCert tlsKey | tr '\n' ' ')
 EOF
         admin_fqdn="admin-${provision_fqdn}"
         admin_origin="https://${admin_fqdn}"
         ;;
-    --tlscert) provision_tls_cert="$2";;
-    --tlskey) provision_tls_key="$2";;
     --version) provision_version="$2";;
     --) break;;
     *) echo "Unknown option $1"; exit 1;;
@@ -107,9 +105,8 @@ sed -e "s/##ADMIN_FQDN##/${admin_fqdn}/" -e "s|##BOX_SRC_DIR##|${BOX_SRC_DIR}|"
 echo "==== Setup ssl certs ===="
 certificate_dir="${NGINX_CONFIG_DIR}/cert"
 mkdir -p "${certificate_dir}"
-cd "${certificate_dir}"
-echo "${provision_tls_cert}" > host.cert
-echo "${provision_tls_key}" > host.key
+echo "${provision_tls_cert}" > ${certificate_dir}/host.cert
+echo "${provision_tls_key}" > ${certificate_dir}/host.key
 
 chown "${USER}:${USER}" -R "/home/${USER}"
 
diff --git a/src/updater.js b/src/updater.js
index a0ccabad8..ce39358b3 100644
--- a/src/updater.js
+++ b/src/updater.js
@@ -145,14 +145,14 @@ function update(callback) {
         var args = {
             version: gBoxUpdateInfo.version,
             boxVersionsUrl: config.get('boxVersionsUrl'),
-            tlsCert: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.cert'), 'utf8'),
-            tlsKey: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.key'), 'utf8'),
 
             // this data is opaque to the installer and will be passed to postinstall.sh
             data: {
                 appServerUrl: config.appServerUrl(),
                 fqdn: config.fqdn(),
-                token: config.token()
+                token: config.token(),
+                tlsCert: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.cert'), 'utf8'),
+                tlsKey: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.key'), 'utf8')
             }
         };