Merge pull request #80 from dappnode/dev

Some fixes
dappnode · Oct 20, 2018 · ffafc7e · ffafc7e
2 parents 7ea09e2 + 78bde40
commit ffafc7e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/build/src/src/calls/getParams.js b/build/src/src/calls/getParams.js
@@ -1,13 +1,19 @@
 const db = require('../db');
 
 async function getParams() {
+ const result = {
+ ip: db.get('ip').value(),
+ name: db.get('name').value(),
+ };
+ const staticIp = db.get('staticIp').value();
+ const domain = db.get('domain').value();
+ if (staticIp) {
+ result.staticIp = staticIp;
+ } else {
+ result.domain = domain;
+ }
  return {
- result: {
- ip: db.get('ip').value(),
- name: db.get('name').value(),
- staticIp: db.get('staticIp').value(),
- domain: db.get('domain').value(),
- },
+ result,
  };
 }
 

diff --git a/build/src/src/calls/setStaticIp.js b/build/src/src/calls/setStaticIp.js
@@ -12,7 +12,7 @@ async function setStaticIp({staticIp}) {
  } else if (oldStaticIp && !staticIp) {
  message = `Disabled static IP`;
  // If the staticIp is being disabled but there is no keypair: register to dyndns
- if (!db.get('keypair').value()) {
+ if (!db.get('registeredToDyndns').value()) {
  await dyndnsClient.updateIp();
  message += `, and registered to dyndns: ${db.get('domain').value()}`;
  }

diff --git a/build/src/src/dyndnsClient/updateIp.js b/build/src/src/dyndnsClient/updateIp.js
@@ -80,6 +80,7 @@ function updateIp() {
  })
  .then((domain) => {
  db.set('domain', domain).write();
+ db.set('registeredToDyndns', true).write();
  })
  .catch((err) => {
  logs.error(`httpGetRequest error: ${err.stack || err.message}`);