Updates
This commit is contained in:
@@ -67,6 +67,7 @@ export default function grabDirNames(param?: Param): {
|
||||
schemasBackupDirName: string;
|
||||
userMainShemaJSONFilePath: string | undefined;
|
||||
maxscaleSSLDir: string;
|
||||
maxscaleSSLCaCertFile: string;
|
||||
mainDBSSLDir: string;
|
||||
replica1DBSSLDir: string;
|
||||
replica2DBSSLDir: string;
|
||||
@@ -89,5 +90,13 @@ export default function grabDirNames(param?: Param): {
|
||||
distroEnterpriseExportTarName: "dsql-enterprise.tar.xz";
|
||||
communityDistroTempDir: string;
|
||||
communityDistroDir: string;
|
||||
installScriptFile: string;
|
||||
updateScriptFile: string;
|
||||
installTypescriptFile: string;
|
||||
updateTypescriptFile: string;
|
||||
dsqlDbDockerComposeFile: string;
|
||||
dsqlDbDockerComposeFileAlt: string;
|
||||
dsqlDbDockerComposeFileName: string;
|
||||
dsqlDbDockerComposeFileNameAlt: string;
|
||||
};
|
||||
export {};
|
||||
|
||||
+22
-2
@@ -26,10 +26,15 @@ function grabDirNames(param) {
|
||||
const publicSSLDir = path_1.default.join(publicDir, "documents", "ssl");
|
||||
const appSSLDir = path_1.default.join(appDir, "ssl");
|
||||
const mainSSLDir = path_1.default.join(DATA_DIR, "ssl");
|
||||
const installScriptFile = path_1.default.join(appDir, "scripts", "shell", "installation", "install.sh");
|
||||
const updateScriptFile = path_1.default.join(appDir, "scripts", "shell", "installation", "update.sh");
|
||||
const installTypescriptFile = path_1.default.join(appDir, "scripts", "shell", "installation", "install.ts");
|
||||
const updateTypescriptFile = path_1.default.join(appDir, "scripts", "shell", "installation", "update.ts");
|
||||
const maxscaleSSLDir = path_1.default.join(mainSSLDir, "maxscale");
|
||||
const mainDBSSLDir = path_1.default.join(mainSSLDir, "main");
|
||||
const replica1DBSSLDir = path_1.default.join(mainSSLDir, "replica-1");
|
||||
const replica2DBSSLDir = path_1.default.join(mainSSLDir, "replica-2");
|
||||
const maxscaleSSLCaCertFile = path_1.default.join(maxscaleSSLDir, "ca-cert.pem");
|
||||
const privateDataDir = path_1.default.join(DATA_DIR, "private");
|
||||
/**
|
||||
* # DB Dir names
|
||||
@@ -106,12 +111,18 @@ function grabDirNames(param) {
|
||||
const dbNginxLoadBalancerConfigFile = path_1.default.join(appDir, "docker/services/mariadb/load-balancer/config/template/nginx.conf");
|
||||
let dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml");
|
||||
let dockerComposeFileAlt = path_1.default.join(appDir, "docker-compose.yaml");
|
||||
const dbDockerComposeFileName = "db.docker-compose.yml";
|
||||
const dbDockerComposeFileNameAlt = "db.docker-compose.yaml";
|
||||
const dsqlDockerComposeFileName = "dsql.docker-compose.yml";
|
||||
const dsqlDockerComposeFileNameAlt = "dsql.docker-compose.yaml";
|
||||
const dsqlDbDockerComposeFileName = "dsql-db.docker-compose.yml";
|
||||
const dsqlDbDockerComposeFileNameAlt = "dsql-db.docker-compose.yaml";
|
||||
const dsqlDockerComposeFile = path_1.default.join(appDir, dsqlDockerComposeFileName);
|
||||
const dsqlDockerComposeFileAlt = path_1.default.join(appDir, dsqlDockerComposeFileNameAlt);
|
||||
const dbDockerComposeFile = path_1.default.join(appDir, "db.docker-compose.yml");
|
||||
const dbDockerComposeFileAlt = path_1.default.join(appDir, "db.docker-compose.yaml");
|
||||
const dbDockerComposeFile = path_1.default.join(appDir, dbDockerComposeFileName);
|
||||
const dbDockerComposeFileAlt = path_1.default.join(appDir, dbDockerComposeFileNameAlt);
|
||||
const dsqlDbDockerComposeFile = path_1.default.join(appDir, dsqlDbDockerComposeFileName);
|
||||
const dsqlDbDockerComposeFileAlt = path_1.default.join(appDir, dsqlDbDockerComposeFileNameAlt);
|
||||
const extraDockerComposeFile = path_1.default.join(appDir, "extra.docker-compose.yml");
|
||||
const extraDockerComposeFileAlt = path_1.default.join(appDir, "extra.docker-compose.yaml");
|
||||
const siteSetupFile = path_1.default.join(appDir, "site-setup.json");
|
||||
@@ -204,6 +215,7 @@ function grabDirNames(param) {
|
||||
schemasBackupDirName,
|
||||
userMainShemaJSONFilePath,
|
||||
maxscaleSSLDir,
|
||||
maxscaleSSLCaCertFile,
|
||||
mainDBSSLDir,
|
||||
replica1DBSSLDir,
|
||||
replica2DBSSLDir,
|
||||
@@ -226,5 +238,13 @@ function grabDirNames(param) {
|
||||
distroEnterpriseExportTarName,
|
||||
communityDistroTempDir,
|
||||
communityDistroDir,
|
||||
installScriptFile,
|
||||
updateScriptFile,
|
||||
installTypescriptFile,
|
||||
updateTypescriptFile,
|
||||
dsqlDbDockerComposeFile,
|
||||
dsqlDbDockerComposeFileAlt,
|
||||
dsqlDbDockerComposeFileName,
|
||||
dsqlDbDockerComposeFileNameAlt,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,4 +6,5 @@ export default function grabIPAddresses(): {
|
||||
localHostIP: string;
|
||||
globalIPPrefix: string;
|
||||
webSocketIP: string;
|
||||
dbCronIP: string;
|
||||
};
|
||||
|
||||
@@ -13,6 +13,7 @@ function grabIPAddresses() {
|
||||
const maxScaleIP = `${globalIPPrefix}.${maxscale}`;
|
||||
const mainDBIP = `${globalIPPrefix}.${db}`;
|
||||
const webSocketIP = `${globalIPPrefix}.${websocket}`;
|
||||
const dbCronIP = `${globalIPPrefix}.${db_cron}`;
|
||||
const localHostIP = `${globalIPPrefix}.1`;
|
||||
return {
|
||||
webAppIP,
|
||||
@@ -22,5 +23,6 @@ function grabIPAddresses() {
|
||||
localHostIP,
|
||||
globalIPPrefix,
|
||||
webSocketIP,
|
||||
dbCronIP,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user