Merge branch 'master' into fronkdev

This commit is contained in:
Frank Schubert
2024-04-18 14:05:22 +02:00
106 changed files with 10509 additions and 211 deletions

View File

@@ -37,6 +37,7 @@ const IVT_DBPASS = "";
const IVT_DBNAME = "ivtdb";
//Raspberry Display Configuration
const XINON_RASPBERRY_DISPLAY_SSH_USER = "changeme";
const XINON_RASPBERRY_DISPLAY_SSH_PASS = "changeme";
@@ -817,4 +818,8 @@ const PDFOUTPUTPATH = BASEDIR . "/var/temp";
const GIT_BIN_PATH = "/usr/bin/git";
const PDFTOTEXT_BIN_PATH = "/usr/bin/pdftotext";
const PDFUNITE_BIN_PATH = "/usr/bin/pdfunite";
const PDFUNITE_BIN_PATH = "/usr/bin/pdfunite";
const TT_KOLMISOFT_API_URL = "vportal.xxx.xx";
const TT_KOLMISOFT_API_KEY = "";
const TT_KOLMISOFT_API_USERNAME = "";