jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove boxVersionsUrl

Browse Source 
update checker now uses the appstore routes
This commit is contained in:
Girish Ramakrishnan
2017-04-13 11:34:55 -07:00
parent cdb5dc2c53
commit eb2ef47df1
8 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/references/api.md
-1
View File
@@ -759,7 +759,6 @@ Response (200):
{
activated: <boolean>,
version: <semver>,
boxVersionsUrl: <url>, // Location of the Cloudron versions file to check for updates
apiServerOrigin: <url>, // Always https://api.cloudron.io
provider: <string>,
cloudronName: <string>
scripts/cloudron-setup
-2
View File
@@ -177,7 +177,6 @@ if [[ -z "${dataJson}" ]]; then
if [[ -z "${restoreUrl}" ]]; then
data=$(cat <<EOF
{
"boxVersionsUrl": "${versionsUrl}",
"fqdn": "${domain}",
"provider": "${provider}",
"apiServerOrigin": "${apiServerOrigin}",
@@ -202,7 +201,6 @@ EOF
else
data=$(cat <<EOF
{
"boxVersionsUrl": "${versionsUrl}",
"fqdn": "${domain}",
"provider": "${provider}",
"apiServerOrigin": "${apiServerOrigin}",
setup/argparser.sh
-4
View File
@@ -5,7 +5,6 @@ json="${source_dir}/../node_modules/.bin/json"
# 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_restore_key=""
@@ -50,8 +49,6 @@ while true; do
[[ "${arg_api_server_origin}" == "" ]] && arg_api_server_origin="https://api.cloudron.io"
arg_web_server_origin=$(echo "$2" | $json webServerOrigin)
[[ "${arg_web_server_origin}" == "" ]] && arg_web_server_origin="https://cloudron.io"
arg_box_versions_url=$(echo "$2" | $json boxVersionsUrl)
[[ "${arg_box_versions_url}" == "" ]] && arg_box_versions_url="https://s3.amazonaws.com/prod-cloudron-releases/versions.json"
# TODO check if an where this is used
arg_version=$(echo "$2" | $json version)
@@ -97,7 +94,6 @@ done
echo "Parsed arguments:"
echo "api server: ${arg_api_server_origin}"
echo "box versions url: ${arg_box_versions_url}"
echo "fqdn: ${arg_fqdn}"
echo "custom domain: ${arg_is_custom_domain}"
echo "restore key: ${arg_restore_key}"
setup/start.sh
+1 -2
View File
@@ -181,7 +181,7 @@ fi
systemctl start nginx
# bookkeep the version as part of data
echo "{ \"version\": \"${arg_version}\", \"boxVersionsUrl\": \"${arg_box_versions_url}\" }" > "${BOX_DATA_DIR}/version"
echo "{ \"version\": \"${arg_version}\", \"apiServerOrigin\": \"${arg_api_server_origin}\" }" > "${BOX_DATA_DIR}/version"
# restart mysql to make sure it has latest config
if [[ ! -f /etc/mysql/mysql.cnf ]] || ! diff -q "${script_dir}/start/mysql.cnf" /etc/mysql/mysql.cnf >/dev/null; then
@@ -235,7 +235,6 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
"webServerOrigin": "${arg_web_server_origin}",
"fqdn": "${arg_fqdn}",
"isCustomDomain": ${arg_is_custom_domain},
"boxVersionsUrl": "${arg_box_versions_url}",
"provider": "${arg_provider}",
"isDemo": ${arg_is_demo},
"database": {
src/cloudron.js
+1 -3
View File
@@ -366,7 +366,6 @@ function getStatus(callback) {
callback(null, {
activated: count !== 0,
version: config.version(),
boxVersionsUrl: config.get('boxVersionsUrl'),
apiServerOrigin: config.apiServerOrigin(), // used by CaaS tool
provider: config.provider(),
cloudronName: cloudronName,
@@ -754,8 +753,7 @@ function doUpdate(boxUpdateInfo, callback) {
webServerOrigin: config.webServerOrigin()
},
version: boxUpdateInfo.version,
boxVersionsUrl: config.get('boxVersionsUrl')
version: boxUpdateInfo.version
};
debug('updating box %s %j', boxUpdateInfo.sourceTarballUrl, data);
src/config.js
-1
View File
@@ -76,7 +76,6 @@ function initConfig() {
data.fqdn = 'localhost';
data.token = null;
data.boxVersionsUrl = null;
data.version = null;
data.isCustomDomain = true;
data.webServerOrigin = null;
src/test/certificates-test.js
-20
View File
@@ -115,8 +115,6 @@ describe('Certificates', function () {
after(cleanup);
it('returns prod caas for prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('caas');
@@ -126,8 +124,6 @@ describe('Certificates', function () {
});
it('returns prod caas for dev cloudron', function (done) {
config.set('boxVersionsUrl', 'http://dev/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('caas');
@@ -137,8 +133,6 @@ describe('Certificates', function () {
});
it('returns prod-acme with altDomain in prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ altDomain: 'foo.something.com' }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -148,8 +142,6 @@ describe('Certificates', function () {
});
it('returns prod acme with altDomain in dev cloudron', function (done) {
config.set('boxVersionsUrl', 'http://dev/release.json');
certificates._getApi({ altDomain: 'foo.something.com' }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -170,8 +162,6 @@ describe('Certificates', function () {
after(cleanup);
it('returns prod acme in prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -181,8 +171,6 @@ describe('Certificates', function () {
});
it('returns prod acme with altDomain in prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ altDomain: 'foo.bar.com' }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -192,8 +180,6 @@ describe('Certificates', function () {
});
it('returns prod acme in dev cloudron', function (done) {
config.set('boxVersionsUrl', 'http://dev/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -214,8 +200,6 @@ describe('Certificates', function () {
after(cleanup);
it('returns staging acme in prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -225,8 +209,6 @@ describe('Certificates', function () {
});
it('returns staging acme in dev cloudron', function (done) {
config.set('boxVersionsUrl', 'http://dev/release.json');
certificates._getApi({ }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
@@ -236,8 +218,6 @@ describe('Certificates', function () {
});
it('returns staging acme with altDomain in prod cloudron', function (done) {
config.set('boxVersionsUrl', 'http://prod/release.json');
certificates._getApi({ altDomain: 'foo.bar.com' }, function (error, api, options) {
expect(error).to.be(null);
expect(api._name).to.be('acme');
src/test/updatechecker-test.js
-2
View File
@@ -93,7 +93,6 @@ function cleanup(done) {
describe('updatechecker - box - manual', function () {
before(function (done) {
config.set('version', '1.0.0');
config.set('boxVersionsUrl', 'http://localhost:4444/release.json');
safe.fs.unlinkSync(paths.UPDATE_CHECKER_FILE);
async.series([
@@ -244,7 +243,6 @@ describe('updatechecker - box - manual', function () {
describe('updatechecker - box - automatic', function () {
before(function (done) {
config.set('version', '1.0.0');
config.set('boxVersionsUrl', 'http://localhost:4444/release.json');
async.series([
database.initialize,
settings.initialize,