retropilot
/
retropilot-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: pass retropilot-server base url to cabana to fetch drives configuration independent

pull/4/head
Florian Brede 2021-05-16 04:56:30 +02:00
parent ec2d421d3d
commit 553307b505
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.sample.js
View File

@ -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,

2
server.js
View File

@ -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);