Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 12:01:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Undeprecate /uploads

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-08 14:24:09 -07:00
parent aaacdb8413
commit 0fffde67b5
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/routes/index.js
View File

@@ -144,21 +144,25 @@ module.exports = function (app, middleware, hotswapIds) {
app.use(middleware.privateUploads);
var statics = [
{ route: '/assets', path: path.join(__dirname, '../../build/public') },
{ route: '/assets', path: path.join(__dirname, '../../public') },
{ route: '/plugins', path: path.join(__dirname, '../../build/public/plugins') },
];
var staticOptions = {
maxAge: app.enabled('cache') ? 5184000000 : 0,
};
if (path.resolve(__dirname, '../../public/uploads') !== nconf.get('upload_path')) {
app.use(relativePath + '/assets/uploads', express.static(nconf.get('upload_path'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
statics.unshift({ route: '/assets/uploads', path: nconf.get('upload_path') });
}
app.use(relativePath + '/assets', express.static(path.join(__dirname, '../../build/public'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
app.use(relativePath + '/assets', express.static(path.join(__dirname, '../../public'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
// TODO: deprecate?
app.use(relativePath + '/plugins', express.static(path.join(__dirname, '../../build/public/plugins'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
statics.forEach(function (obj) {
app.use(relativePath + obj.route, express.static(obj.path, staticOptions));
});
app.use(relativePath + '/uploads', function (req, res) {
res.redirect(relativePath + '/assets/uploads' + req.path + '?' + meta.config['cache-buster']);
});
// DEPRECATED
var deprecatedPaths = [
@@ -170,7 +174,6 @@ module.exports = function (app, middleware, hotswapIds) {
'/logo.png',
'/favicon.ico',
'/vendor/',
'/uploads/',
'/templates/',
'/src/',
'/images/',