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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam
2021-01-14 21:53:05 +01:00
parent 3f2e8717b3 e06c5703ee
commit cbc1f63732
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config-sample.ini
View File

@@ -5,6 +5,9 @@ instanceName=
# set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password) # set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
noAuthentication=false noAuthentication=false
# set to true to disable backups (e.g. because of limited space on server)
noBackup=false
# Disable automatically generating desktop icon # Disable automatically generating desktop icon
# noDesktopIcon=true # noDesktopIcon=true

2
src/services/build.js
View File

@@ -1 +1 @@
module.exports = { buildDate:"2021-01-11T22:29:31+01:00", buildRevision: "369274ead75947a68bf7bbb5ab1e784e81521030" }; module.exports = { buildDate:"2021-01-11T22:47:11+01:00", buildRevision: "6afc299efb616d47c72b5f58ab2827c0e3e121c2" };

7
src/services/sql_init.js
View File

@@ -9,6 +9,7 @@ const Option = require('../entities/option');
const TaskContext = require('./task_context.js'); const TaskContext = require('./task_context.js');
const migrationService = require('./migration'); const migrationService = require('./migration');
const cls = require('./cls'); const cls = require('./cls');
const config = require('./config');
const dbReady = utils.deferred(); const dbReady = utils.deferred();
@@ -133,6 +134,12 @@ function setDbAsInitialized() {
} }
dbReady.then(() => { dbReady.then(() => {
if (config.General && config.General.noBackup === true) {
log.info("Disabling scheduled backups.");
return;
}
setInterval(() => require('./backup').regularBackup(), 4 * 60 * 60 * 1000); setInterval(() => require('./backup').regularBackup(), 4 * 60 * 60 * 1000);
// kickoff first backup soon after start up // kickoff first backup soon after start up