From abb2c7927ca1640a755e0ec32c51bcc9c873b34c Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sat, 29 Sep 2018 19:53:49 +0200 Subject: show last commit hash alongside server version in footer --- server/controllers/api/config.ts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'server/controllers/api/config.ts') diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 95549b724..633cf5e34 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -10,6 +10,7 @@ import { customConfigUpdateValidator } from '../../middlewares/validators/config import { ClientHtml } from '../../lib/client-html' import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger' import { remove, writeJSON } from 'fs-extra' +import { version } from '../../tools/cli' const packageJSON = require('../../../../package.json') const configRouter = express.Router() @@ -38,9 +39,12 @@ configRouter.delete('/custom', asyncMiddleware(deleteCustomConfig) ) +let serverCommit: string async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { const allowed = await isSignupAllowed() const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip) + serverCommit = (serverCommit) ? serverCommit : version() + if (serverCommit === packageJSON.version) serverCommit = '' const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS) .filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true) @@ -58,6 +62,7 @@ async function getConfig (req: express.Request, res: express.Response, next: exp } }, serverVersion: packageJSON.version, + serverCommit, signup: { allowed, allowedForCurrentIP, -- cgit v1.2.3