diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index 099883f18..8d649a9be 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -19,7 +19,8 @@ exports = module.exports = { updateDashboardDomain, prepareDashboardDomain, renewCerts, - getServerIp, + getServerIpv4, + getServerIpv6, getLanguages, syncExternalLdap, syncDnsRecords @@ -293,13 +294,18 @@ async function syncExternalLdap(req, res, next) { next(new HttpSuccess(202, { taskId })); } -async function getServerIp(req, res, next) { - const [ipv4Error, ipv4] = await safe(sysinfo.getServerIPv4()); - if (ipv4Error) return next(BoxError.toHttpError(ipv4Error)); +async function getServerIpv4(req, res, next) { + const [error, ipv4] = await safe(sysinfo.getServerIPv4()); + if (error) return next(BoxError.toHttpError(error)); - const [, ipv6] = await safe(sysinfo.getServerIPv6(), { debug }); // ignore any error + next(new HttpSuccess(200, { ipv4 })); +} - next(new HttpSuccess(200, { ipv4, ipv6 })); +async function getServerIpv6(req, res, next) { + const [error, ipv6] = await safe(sysinfo.getServerIPv6()); // ignore any error + if (error) return next(BoxError.toHttpError(error)); + + next(new HttpSuccess(200, { ipv6 })); } async function getLanguages(req, res, next) { diff --git a/src/server.js b/src/server.js index 3d959a922..fd8d9e698 100644 --- a/src/server.js +++ b/src/server.js @@ -121,7 +121,8 @@ function initializeExpressSync() { router.get ('/api/v1/cloudron/eventlog', token, authorizeAdmin, routes.eventlog.list); router.get ('/api/v1/cloudron/eventlog/:eventId', token, authorizeAdmin, routes.eventlog.get); router.post('/api/v1/cloudron/sync_external_ldap', json, token, authorizeAdmin, routes.cloudron.syncExternalLdap); - router.get ('/api/v1/cloudron/server_ip', token, authorizeAdmin, routes.cloudron.getServerIp); + router.get ('/api/v1/cloudron/server_ipv4', token, authorizeAdmin, routes.cloudron.getServerIpv4); + router.get ('/api/v1/cloudron/server_ipv6', token, authorizeAdmin, routes.cloudron.getServerIpv6); // task routes router.get ('/api/v1/tasks', token, authorizeAdmin, routes.tasks.list);