Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 00:05:50 +01:00
Code Issues Packages Projects Releases Activity

#98 proxy support for sync setup

Browse Source
This commit is contained in:
azivner
2018-07-25 08:30:41 +02:00
parent 0ece9bd1be
commit c8253caae9
7 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/setup.js
View File

@@ -14,7 +14,7 @@ function triggerSync() {
});
}
async function setupSyncFromSyncServer(serverAddress, username, password) {
async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, password) {
if (await sqlInit.isDbInitialized()) {
return {
result: 'failure',
@@ -27,7 +27,7 @@ async function setupSyncFromSyncServer(serverAddress, username, password) {
// response is expected to contain documentId and documentSecret options
const options = await rp.get({
uri: serverAddress + '/api/sync/document',
uri: syncServerHost + '/api/sync/document',
auth: {
'user': username,
'pass': password
@@ -35,7 +35,11 @@ async function setupSyncFromSyncServer(serverAddress, username, password) {
json: true
});
await sqlInit.createDatabaseForSync(options, serverAddress);
if (syncProxy) {
options.proxy = syncProxy;
}
await sqlInit.createDatabaseForSync(options, syncServerHost, syncProxy);
triggerSync();