dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move __version__ to a script

Browse source
This commit is contained in:
Peter deHaan 2017-06-23 16:53:17 -07:00
parent 2b01bb75dc
commit 314e756ef1
No known key found for this signature in database
GPG key ID: F0FC6C01C6305097
4 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/portal_server.js
View file

@ -7,9 +7,6 @@ const helmet = require('helmet');
const bytes = require('bytes');
const conf = require('./config.js');
const storage = require('./storage.js');
const pkg = require('../package.json');
const gitSHA = require('git-rev-sync').short();
const notLocalHost = conf.notLocalHost;
@ -17,6 +14,8 @@ const mozlog = require('./log.js');
const log = mozlog('portal.server');
const STATIC_PATH = path.join(__dirname, '../public');
const app = express();
app.engine('handlebars', exphbs({
@ -28,8 +27,7 @@ app.set('view engine', 'handlebars');
app.use(helmet());
app.use(busboy());
app.use(bodyParser.json());
app.use(express.static(path.join(__dirname, '../public')));
app.use(express.static(STATIC_PATH));
app.get('/', (req, res) => {
res.render('index', {
@ -154,11 +152,7 @@ app.get('/__lbheartbeat__', (req, res) => {
});
app.get('/__version__', (req, res) => {
res.json({
commit: gitSHA,
source: pkg.homepage,
version: pkg.version
});
res.sendFile(path.join(STATIC_PATH, 'version.json'));
});
app.listen(conf.listen_port, () => {