admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-11-26 23:27:48 +00:00
parent 315f599b72
commit 3e0bdd27a9
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -52,8 +52,8 @@
// "AYANOVA_USE_URLS": "http://*:7575;", // "AYANOVA_USE_URLS": "http://*:7575;",
// //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", // //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000",
// //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", // //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", //"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
//"AYANOVA_FOLDER_USER_FILES":"%ProgramData%\\ayanova\\userfiles", "AYANOVA_FOLDER_USER_FILES":"%ProgramData%\\ayanova\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
// "AYANOVA_SERVER_TEST_MODE": "false", // "AYANOVA_SERVER_TEST_MODE": "false",

2
dist/install/windows-pg-standalone/ayanovaserver.iss vendored
View File

@@ -47,7 +47,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files] [Files]
Source: "C:\data\code\raven\dist\win-x64\ayanova\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\data\code\raven\dist\win-x64\ayanova\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\data\code\raven\dist\win-x64\ayanova\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "C:\data\code\raven\dist\win-x64\ayanova\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\data\code\raven\dist\win-x64\launcher\appsettings.json"; DestDir: "{app}"; Flags: ignoreversion confirmoverwrite Source: "C:\data\code\raven\dist\win-x64\launcher\config.json"; DestDir: "{app}"; Flags: ignoreversion confirmoverwrite
Source: "C:\data\code\raven\dist\win-x64\launcher\*"; DestDir: "{app}\launcher"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "C:\data\code\raven\dist\win-x64\launcher\*"; DestDir: "{app}\launcher"; Flags: ignoreversion recursesubdirs createallsubdirs
;Source: "C:\data\code\raven\dist\win-x64\launcher\{#MyAppLauncherExeName}"; DestDir: "{app}"; Flags: ignoreversion ;Source: "C:\data\code\raven\dist\win-x64\launcher\{#MyAppLauncherExeName}"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

11
server/AyaNova/util/FileUtil.cs
View File

@@ -64,7 +64,7 @@ namespace AyaNova.Util
//create path if doesn't exist already //create path if doesn't exist already
private static void EnsurePath(string path) private static void EnsurePath(string path)
{ {
Console.WriteLine($"FileUtil::EnsurePath path = [{path}]"); //Console.WriteLine($"FileUtil::EnsurePath path = [{path}]");
if (!Directory.Exists(path)) if (!Directory.Exists(path))
Directory.CreateDirectory(path); Directory.CreateDirectory(path);
} }
@@ -821,6 +821,15 @@ namespace AyaNova.Util
return ret; return ret;
} }
public static string StringPathDecodeEnvironmentVariables(string path){
if(string.IsNullOrWhiteSpace(path)){
return string.Empty;
}
return System.Environment.ExpandEnvironmentVariables(path);
}
#endregion general utilities #endregion general utilities
}//eoc }//eoc

13
server/AyaNova/util/ServerBootConfig.cs
View File

@@ -181,10 +181,10 @@ namespace AyaNova.Util
//FOLDERS //FOLDERS
//Log folder //Log folder
AYANOVA_LOG_PATH = config.GetValue<string>("AYANOVA_LOG_PATH"); AYANOVA_LOG_PATH = FileUtil.StringPathDecodeEnvironmentVariables(config.GetValue<string>("AYANOVA_LOG_PATH"));
if (AYANOVA_LOG_PATH == null) if (string.IsNullOrWhiteSpace(AYANOVA_LOG_PATH))
{ {
//DEFAULT LOG PATH //DEFAULT LOG PATH
var currentDir = Directory.GetCurrentDirectory(); var currentDir = Directory.GetCurrentDirectory();
@@ -197,16 +197,16 @@ namespace AyaNova.Util
//(note, startup.cs ensures these folders exist via FileUtil because we need IHostingEnvironment) //(note, startup.cs ensures these folders exist via FileUtil because we need IHostingEnvironment)
//UserFiles //UserFiles
AYANOVA_FOLDER_USER_FILES = config.GetValue<string>("AYANOVA_FOLDER_USER_FILES"); AYANOVA_FOLDER_USER_FILES = FileUtil.StringPathDecodeEnvironmentVariables(config.GetValue<string>("AYANOVA_FOLDER_USER_FILES"));
//BackupFiles //BackupFiles
AYANOVA_FOLDER_BACKUP_FILES = config.GetValue<string>("AYANOVA_FOLDER_BACKUP_FILES"); AYANOVA_FOLDER_BACKUP_FILES = FileUtil.StringPathDecodeEnvironmentVariables(config.GetValue<string>("AYANOVA_FOLDER_BACKUP_FILES"));
//TemporaryFiles //TemporaryFiles
AYANOVA_FOLDER_TEMPORARY_SERVER_FILES = config.GetValue<string>("AYANOVA_FOLDER_TEMPORARY_SERVER_FILES"); AYANOVA_FOLDER_TEMPORARY_SERVER_FILES = FileUtil.StringPathDecodeEnvironmentVariables(config.GetValue<string>("AYANOVA_FOLDER_TEMPORARY_SERVER_FILES"));
//pgdump backup utility path //pgdump backup utility path
AYANOVA_BACKUP_PG_DUMP_PATH = config.GetValue<string>("AYANOVA_BACKUP_PG_DUMP_PATH"); AYANOVA_BACKUP_PG_DUMP_PATH = FileUtil.StringPathDecodeEnvironmentVariables(config.GetValue<string>("AYANOVA_BACKUP_PG_DUMP_PATH"));
//backdoor back door password superuser reset //backdoor back door password superuser reset
AYANOVA_SET_SUPERUSER_PW = config.GetValue<string>("AYANOVA_SET_SUPERUSER_PW"); AYANOVA_SET_SUPERUSER_PW = config.GetValue<string>("AYANOVA_SET_SUPERUSER_PW");
@@ -218,6 +218,7 @@ namespace AyaNova.Util
} }
//Fetch first url from list of urls (used by generator) //Fetch first url from list of urls (used by generator)
internal static string FirstOfAyaNovaUseUrls internal static string FirstOfAyaNovaUseUrls
{ {