From 553307b5050a9fe039569d3124788192a6fb2245 Mon Sep 17 00:00:00 2001 From: Florian Brede Date: Sun, 16 May 2021 04:56:30 +0200 Subject: [PATCH] FIX: pass retropilot-server base url to cabana to fetch drives configuration independent --- config.sample.js | 7 ++++--- server.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.sample.js b/config.sample.js index 779662f..afb313f 100644 --- a/config.sample.js +++ b/config.sample.js @@ -13,12 +13,13 @@ var config = { sslKey: 'certs/retropilot.key', sslCrt: 'certs/retropilot.crt', - baseUploadUrl: 'http://192.168.1.165:3000/backend/post_upload', - - baseDriveDownloadUrl: 'http://192.168.1.165:3000/realdata/', + baseUrl: 'http://192.168.1.165:3000/', // base url of the retropilot server + baseUploadUrl: 'http://192.168.1.165:3000/backend/post_upload', // base url sent to devices for POSTing drives & logs + baseDriveDownloadUrl: 'http://192.168.1.165:3000/realdata/', // base download url for drive & log data baseDriveDownloadPathMapping: '/realdata', // path mapping of above download url for expressjs, prefix with "/" storagePath: 'realdata/', // relative or absolute ( "/..." for absolute path ) + deviceStorageQuotaMb: 200000, deviceDriveQuota: 1000, deviceDriveExpirationDays: 30, diff --git a/server.js b/server.js index 5df4bdc..d72e5d1 100644 --- a/server.js +++ b/server.js @@ -928,7 +928,7 @@ app.get('/useradmin/drive/:dongleId/:driveIdentifier', (req, res) => { var cabanaUrl = null; if (drive.is_processed) { - cabanaUrl=config.cabanaUrl+'?retropilotIdentifier='+device.dongle_id+'|'+dongleIdHash+'|'+drive.identifier+'|'+driveIdentifierHash+'&demo=1"'; + cabanaUrl=config.cabanaUrl+'?retropilotIdentifier='+device.dongle_id+'|'+dongleIdHash+'|'+drive.identifier+'|'+driveIdentifierHash+'&retropilotHost='+encodeURIComponent(config.baseUrl)+'&demo=1"'; } const directoryTree = dirTree(config.storagePath+device.dongle_id+"/"+dongleIdHash+"/"+driveIdentifierHash+"/"+drive.identifier);