diff --git a/setup/argparser.sh b/setup/argparser.sh index ea6c42fc4..23d3edb45 100644 --- a/setup/argparser.sh +++ b/setup/argparser.sh @@ -3,19 +3,20 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" json="${script_dir}/../node_modules/.bin/json" -arg_restore_url="" -arg_restore_key="" +# IMPORTANT: Fix cloudron.js:doUpdate if you add/remove any arg. keep these sorted for readability +arg_api_server_origin="" arg_box_versions_url="" +arg_fqdn="" +arg_is_custom_domain="false" +arg_model="" +arg_restore_key="" +arg_restore_url="" +arg_retire="false" arg_tls_cert="" arg_tls_key="" -arg_api_server_origin="" -arg_web_server_origin="" -arg_fqdn="" arg_token="" arg_version="" -arg_is_custom_domain="false" -arg_retire="false" -arg_model="" +arg_web_server_origin="" args=$(getopt -o "" -l "data:,retire" -n "$0" -- "$@") eval set -- "${args}" @@ -52,15 +53,16 @@ EOF done echo "Parsed arguments:" -echo "restore url: ${arg_restore_url}" -echo "restore key: ${arg_restore_key}" -echo "box versions url: ${arg_box_versions_url}" echo "api server: ${arg_api_server_origin}" -echo "web server: ${arg_web_server_origin}" +echo "box versions url: ${arg_box_versions_url}" echo "fqdn: ${arg_fqdn}" -echo "token: ${arg_token}" -echo "version: ${arg_version}" echo "custom domain: ${arg_is_custom_domain}" +echo "model: ${arg_model}" +echo "restore key: ${arg_restore_key}" +echo "restore url: ${arg_restore_url}" echo "tls cert: ${arg_tls_cert}" echo "tls key: ${arg_tls_key}" -echo "model: ${arg_model}" +echo "token: ${arg_token}" +echo "version: ${arg_version}" +echo "web server: ${arg_web_server_origin}" + diff --git a/src/cloudron.js b/src/cloudron.js index cd7555ab4..124994f7d 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -493,19 +493,19 @@ function doUpdate(boxUpdateInfo, callback) { var args = { sourceTarballUrl: result.body.url, - // this data is opaque to the installer + // IMPORTANT: if you change this, fix up argparser.sh as well. keep these sorted for readability data: { - boxVersionsUrl: config.get('boxVersionsUrl'), - version: boxUpdateInfo.version, apiServerOrigin: config.apiServerOrigin(), - webServerOrigin: config.webServerOrigin(), + boxVersionsUrl: config.get('boxVersionsUrl'), fqdn: config.fqdn(), - 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'), isCustomDomain: config.isCustomDomain(), + restoreKey: null, restoreUrl: null, - restoreKey: null + tlsKey: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.key'), 'utf8'), + tlsCert: fs.readFileSync(path.join(paths.NGINX_CERT_DIR, 'host.cert'), 'utf8'), + token: config.token(), + version: boxUpdateInfo.version, + webServerOrigin: config.webServerOrigin() } };