From b4767ee7067ff1f9942d3fd883cbbd4e5639381d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 29 Nov 2021 21:15:10 +0000 Subject: [PATCH] --- .vscode/launch.json | 50 +++++++++---------- .../docs/ops-config-folder-backup-files.md | 4 +- .../docs/ops-config-folder-temporary-files.md | 4 +- .../docs/ops-config-folder-user-files.md | 12 ++--- docs/8.0/ayanova/mkdocs.yml | 7 +-- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5ffb58fe..fbc301e6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,7 +4,6 @@ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md "version": "0.2.0", "configurations": [ - { "name": ".NET Core Launch (web)", "type": "coreclr", @@ -38,29 +37,30 @@ // "command": "xdg-open" // } // }, - "env": { - // "ASPNETCORE_ENVIRONMENT": "Development", - // "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", - // //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", - // "AYANOVA_LOG_LEVEL": "Info", - // //"AYANOVA_LOG_LEVEL": "Debug", - // // "AYANOVA_LOG_LEVEL": "Trace", - // "AYANOVA_DEFAULT_TRANSLATION": "en", - // //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", - "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", - // //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", - // "AYANOVA_USE_URLS": "http://*:7575;", - // //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", - // //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", - //"AYANOVA_ATTACHMENT_FILES_PATH": "c:\\temp\\RavenTestData\\userfiles", - "AYANOVA_ATTACHMENT_FILES_PATH":"%ProgramData%\\ayanova\\userfiles", - "AYANOVA_BACKUP_FILES_PATH": "c:\\temp\\RavenTestData\\backupfiles", - "AYANOVA_TEMP_FILES_PATH": "c:\\temp\\RavenTestData\\tempfiles", - // "AYANOVA_SERVER_TEST_MODE": "false", - // "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", - // "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", - // "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" - }, + "env": { + // "ASPNETCORE_ENVIRONMENT": "Development", + // "AYANOVA_JWT_SECRET": "UNLICENSED5G*QQJ8#bQ7$Xr_@sXfHq4", + // //"AYANOVA_SET_SUPERUSER_PW": "l3tm3in", + // "AYANOVA_LOG_LEVEL": "Info", + // //"AYANOVA_LOG_LEVEL": "Debug", + // // "AYANOVA_LOG_LEVEL": "Trace", + // "AYANOVA_DEFAULT_TRANSLATION": "en", + // //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", + "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", + "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", + // //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", + // "AYANOVA_USE_URLS": "http://*:7575;", + // //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", + // //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", + //"AYANOVA_ATTACHMENT_FILES_PATH": "c:\\temp\\RavenTestData\\userfiles", + // "AYANOVA_ATTACHMENT_FILES_PATH":"%ProgramData%\\ayanova\\userfiles", + // "AYANOVA_BACKUP_FILES_PATH": "c:\\temp\\RavenTestData\\backupfiles", + // "AYANOVA_TEMP_FILES_PATH": "c:\\temp\\RavenTestData\\tempfiles", + // "AYANOVA_SERVER_TEST_MODE": "false", + // "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", + // "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", + "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" + }, "sourceFileMap": { "/Views": "${workspaceFolder}/Views" } @@ -72,4 +72,4 @@ "processId": "${command:pickProcess}" } ] -} +} \ No newline at end of file diff --git a/docs/8.0/ayanova/docs/ops-config-folder-backup-files.md b/docs/8.0/ayanova/docs/ops-config-folder-backup-files.md index 3c3b8773..d92607fb 100644 --- a/docs/8.0/ayanova/docs/ops-config-folder-backup-files.md +++ b/docs/8.0/ayanova/docs/ops-config-folder-backup-files.md @@ -15,7 +15,7 @@ AyaNova expects the backup files folder path to be provided by an environment va `AYANOVA_BACKUP_FILES_PATH` The value specified should be a string containing a fully qualified file path for the platform, for example: -`c:\data\ayanova\backupfiles` +`c:\ProgramData\ayanova\backupfiles` Example command line parameter @@ -25,7 +25,7 @@ Example environment variable Windows -`set "AYANOVA_BACKUP_FILES_PATH=c:\data\ayanova\backupfiles"` +`set "AYANOVA_BACKUP_FILES_PATH=c:\ProgramData\ayanova\backupfiles"` Linux / MAC diff --git a/docs/8.0/ayanova/docs/ops-config-folder-temporary-files.md b/docs/8.0/ayanova/docs/ops-config-folder-temporary-files.md index 2c04920b..3ff19aa3 100644 --- a/docs/8.0/ayanova/docs/ops-config-folder-temporary-files.md +++ b/docs/8.0/ayanova/docs/ops-config-folder-temporary-files.md @@ -15,7 +15,7 @@ AyaNova expects the temporary files folder path to be provided by an environment `AYANOVA_TEMP_FILES_PATH` The value specified should be a string containing a fully qualified file path for the platform, for example: -`c:\data\ayanova\tempfiles` +`c:\ProgramData\ayanova\tempfiles` Example command line parameter @@ -25,7 +25,7 @@ Example environment variable Windows -`set "AYANOVA_TEMP_FILES_PATH=c:\data\ayanova\tempfiles"` +`set "AYANOVA_TEMP_FILES_PATH=c:\ProgramData\ayanova\tempfiles"` Linux / MAC diff --git a/docs/8.0/ayanova/docs/ops-config-folder-user-files.md b/docs/8.0/ayanova/docs/ops-config-folder-user-files.md index e7aafed8..917d8b03 100644 --- a/docs/8.0/ayanova/docs/ops-config-folder-user-files.md +++ b/docs/8.0/ayanova/docs/ops-config-folder-user-files.md @@ -1,4 +1,4 @@ -# USER FILES FOLDER SETTING +# ATTACHMENTS FOLDER SETTING This setting controls where AyaNova stores user uploaded files used by features that allow file attachment or uploads. AyaNova stores these files with random names in the folder specified. @@ -7,7 +7,7 @@ Warning: this folder MUST NOT be the same location set for [AYANOVA_BACKUP_FILES ## Default -If no override is specified AyaNova will store user files in a `userfiles` folder in the location specified by [AYANOVA_DATA_PATH](ops-config-data-path.md) setting. +If no override is specified AyaNova will store user files in a `attachments` folder in the location specified by [AYANOVA_DATA_PATH](ops-config-data-path.md) setting. ## Overriding @@ -16,20 +16,20 @@ AyaNova expects the user files folder path to be provided by an environment vari `AYANOVA_ATTACHMENT_FILES_PATH` The value specified should be a string containing a fully qualified file path for the platform, for example: -`c:\data\ayanova\userfiles` +`c:\ProgramData\ayanova\attachments` Example command line parameter -`ayanova.exe --AYANOVA_ATTACHMENT_FILES_PATH="/var/lib/ayanova/userfiles"` +`ayanova.exe --AYANOVA_ATTACHMENT_FILES_PATH="/var/lib/ayanova/attachments"` Example environment variable Windows -`set "AYANOVA_ATTACHMENT_FILES_PATH=c:\data\ayanova\userfiles"` +`set "AYANOVA_ATTACHMENT_FILES_PATH=c:\ProgramData\ayanova\attachments"` Linux / MAC -`export AYANOVA_ATTACHMENT_FILES_PATH="/var/lib/ayanova/userfiles"` +`export AYANOVA_ATTACHMENT_FILES_PATH="/var/lib/ayanova/attachments"` If both a command line parameter and an environment variable are set the command line parameter takes precedence. diff --git a/docs/8.0/ayanova/mkdocs.yml b/docs/8.0/ayanova/mkdocs.yml index f0347936..c1b7edcd 100644 --- a/docs/8.0/ayanova/mkdocs.yml +++ b/docs/8.0/ayanova/mkdocs.yml @@ -138,7 +138,8 @@ nav: - 'View server settings': 'ops-server-information.md' - 'Server locale settings': 'ops-server-locale.md' - 'Translation / Language': 'ops-config-default-translation.md' - - 'User files folder': 'ops-config-folder-user-files.md' + - 'Data path': 'ops-config-data-path.md' + - 'Attachments folder': 'ops-config-folder-user-files.md' - 'Server temporary files folder': 'ops-config-folder-temporary-files.md' - 'Database configuration': 'ops-config-db.md' - 'PORT and URL configuration': 'ops-config-use-urls.md' @@ -153,8 +154,8 @@ nav: - 'Metrics': 'ops-metrics.md' - 'Notification system': 'ops-notification-system.md' - 'Notification queue': 'ops-notify-queue.md' - - 'Backup config PGDUMP path': 'ops-config-backup-pgdump-path.md' - - 'Backup config folder': 'ops-config-folder-backup-files.md' + - 'Backup utility PGDUMP path': 'ops-config-backup-pgdump-path.md' + - 'Backup folder': 'ops-config-folder-backup-files.md' - 'Restore backup': 'ops-restore.md' - Developer guide: - 'Introduction': 'api-intro.md'