Merge branch 'develop' into renovate/draggabilly-3.x

.gitignore

@@ -9,12 +9,12 @@ po-*/
 
 *.db
 !integration-tests/db/document.db
+!integration-tests/db/config.ini
 integration-tests/db/log
 integration-tests/db/sessions
 integration-tests/db/backup
 integration-tests/db/session_secret.txt
 
-config.ini
 cert.key
 cert.crt
 server-package.json

integration-tests/db/config.ini

@@ -0,0 +1,29 @@
+[General]
+# Instance name can be used to distinguish between different instances using backend api.getInstanceName()
+instanceName=
+
+# set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
+noAuthentication=true
+
+# set to true to disable backups (e.g. because of limited space on server)
+noBackup=false
+
+# Disable automatically generating desktop icon
+# noDesktopIcon=true
+
+[Network]
+# host setting is relevant only for web deployments - set the host on which the server will listen
+# host=0.0.0.0
+# port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
+port=8080
+# true for TLS/SSL/HTTPS (secure), false for HTTP (insecure).
+https=false
+# path to certificate (run "bash bin/generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
+certPath=
+keyPath=
+# setting to give trust to reverse proxies, a comma-separated list of trusted rev. proxy IPs can be specified (CIDR notation is permitted),
+# alternatively 'true' will make use of the leftmost IP in X-Forwarded-For, ultimately an integer can be used to tell about the number of hops between
+# Trilium (which is hop 0) and the first trusted rev. proxy. 
+# once set, expressjs will use the X-Forwarded-For header set by the rev. proxy to determinate the real IPs of clients.
+# expressjs shortcuts are supported: loopback(127.0.0.1/8, ::1/128), linklocal(169.254.0.0/16, fe80::/10), uniquelocal(10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
+trustedReverseProxy=false

playwright.config.ts

@@ -1,5 +1,7 @@
 import { defineConfig, devices } from '@playwright/test';
 
+const SERVER_URL = 'http://127.0.0.1:8082';
+
 /**
  * Read environment variables from file.
  * https://github.com/motdotla/dotenv
@@ -26,7 +28,7 @@ export default defineConfig({
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://127.0.0.1:8082',
+    baseURL: SERVER_URL,
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -71,9 +73,9 @@ export default defineConfig({
   ],
 
   /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://127.0.0.1:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
+  webServer: {
+    command: 'npm run integration-mem-db-dev',
+    url: SERVER_URL,
+    // reuseExistingServer: !process.env.CI,
+  },
 });