fix uploads path to match nginx /var/www/oldvine/uploads
This commit is contained in:
@@ -11,10 +11,10 @@ const isProd = process.env.NODE_ENV === 'production';
|
|||||||
// In dev: oldvine_cms/client/public
|
// In dev: oldvine_cms/client/public
|
||||||
const devPublicRoot = path.join(__dirname, '../../client/public');
|
const devPublicRoot = path.join(__dirname, '../../client/public');
|
||||||
|
|
||||||
// On server: nginx serves /uploads from /var/www/oldvine_uploads (recommended)
|
// On server: nginx serves /uploads from /var/www/oldvine/uploads (matches current nginx config)
|
||||||
const uploadsDir =
|
const uploadsDir =
|
||||||
process.env.UPLOADS_DIR ||
|
process.env.UPLOADS_DIR ||
|
||||||
(isProd ? '/var/www/oldvine_uploads' : path.join(devPublicRoot, 'uploads'));
|
(isProd ? '/var/www/oldvine/uploads' : path.join(devPublicRoot, 'uploads'));
|
||||||
|
|
||||||
// Ensure uploads directory exists
|
// Ensure uploads directory exists
|
||||||
if (!fs.existsSync(uploadsDir)) {
|
if (!fs.existsSync(uploadsDir)) {
|
||||||
@@ -29,7 +29,6 @@ const safeBaseName = (name) =>
|
|||||||
.replace(/-+/g, '-')
|
.replace(/-+/g, '-')
|
||||||
.replace(/^-|-$/g, '');
|
.replace(/^-|-$/g, '');
|
||||||
|
|
||||||
// Pick output format so extension matches actual bytes (important!)
|
|
||||||
const pickOutput = (mimetype) => {
|
const pickOutput = (mimetype) => {
|
||||||
if (mimetype === 'image/png') return { ext: '.png', fmt: 'png' };
|
if (mimetype === 'image/png') return { ext: '.png', fmt: 'png' };
|
||||||
if (mimetype === 'image/webp') return { ext: '.webp', fmt: 'webp' };
|
if (mimetype === 'image/webp') return { ext: '.webp', fmt: 'webp' };
|
||||||
|
|||||||
Reference in New Issue
Block a user