FIX: pass retropilot-server base url to cabana to fetch drives configuration independent
parent
ec2d421d3d
commit
553307b505
|
@ -13,12 +13,13 @@ var config = {
|
||||||
sslKey: 'certs/retropilot.key',
|
sslKey: 'certs/retropilot.key',
|
||||||
sslCrt: 'certs/retropilot.crt',
|
sslCrt: 'certs/retropilot.crt',
|
||||||
|
|
||||||
baseUploadUrl: 'http://192.168.1.165:3000/backend/post_upload',
|
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/',
|
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 "/"
|
baseDriveDownloadPathMapping: '/realdata', // path mapping of above download url for expressjs, prefix with "/"
|
||||||
|
|
||||||
storagePath: 'realdata/', // relative or absolute ( "/..." for absolute path )
|
storagePath: 'realdata/', // relative or absolute ( "/..." for absolute path )
|
||||||
|
|
||||||
deviceStorageQuotaMb: 200000,
|
deviceStorageQuotaMb: 200000,
|
||||||
deviceDriveQuota: 1000,
|
deviceDriveQuota: 1000,
|
||||||
deviceDriveExpirationDays: 30,
|
deviceDriveExpirationDays: 30,
|
||||||
|
|
|
@ -928,7 +928,7 @@ app.get('/useradmin/drive/:dongleId/:driveIdentifier', (req, res) => {
|
||||||
|
|
||||||
var cabanaUrl = null;
|
var cabanaUrl = null;
|
||||||
if (drive.is_processed) {
|
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);
|
const directoryTree = dirTree(config.storagePath+device.dongle_id+"/"+dongleIdHash+"/"+driveIdentifierHash+"/"+drive.identifier);
|
||||||
|
|
Loading…
Reference in New Issue