Updates
This commit is contained in:
@@ -45,11 +45,43 @@ export default function grabDirNames(param?: Param) {
|
||||
const appSSLDir = path.join(appDir, "ssl");
|
||||
const mainSSLDir = path.join(DATA_DIR, "ssl");
|
||||
|
||||
const installScriptFile = path.join(
|
||||
appDir,
|
||||
"scripts",
|
||||
"shell",
|
||||
"installation",
|
||||
"install.sh"
|
||||
);
|
||||
const updateScriptFile = path.join(
|
||||
appDir,
|
||||
"scripts",
|
||||
"shell",
|
||||
"installation",
|
||||
"update.sh"
|
||||
);
|
||||
|
||||
const installTypescriptFile = path.join(
|
||||
appDir,
|
||||
"scripts",
|
||||
"shell",
|
||||
"installation",
|
||||
"install.ts"
|
||||
);
|
||||
const updateTypescriptFile = path.join(
|
||||
appDir,
|
||||
"scripts",
|
||||
"shell",
|
||||
"installation",
|
||||
"update.ts"
|
||||
);
|
||||
|
||||
const maxscaleSSLDir = path.join(mainSSLDir, "maxscale");
|
||||
const mainDBSSLDir = path.join(mainSSLDir, "main");
|
||||
const replica1DBSSLDir = path.join(mainSSLDir, "replica-1");
|
||||
const replica2DBSSLDir = path.join(mainSSLDir, "replica-2");
|
||||
|
||||
const maxscaleSSLCaCertFile = path.join(maxscaleSSLDir, "ca-cert.pem");
|
||||
|
||||
const privateDataDir = path.join(DATA_DIR, "private");
|
||||
|
||||
/**
|
||||
@@ -158,15 +190,32 @@ export default function grabDirNames(param?: Param) {
|
||||
|
||||
let dockerComposeFile = path.join(appDir, "docker-compose.yml");
|
||||
let dockerComposeFileAlt = path.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.join(appDir, dsqlDockerComposeFileName);
|
||||
const dsqlDockerComposeFileAlt = path.join(
|
||||
appDir,
|
||||
dsqlDockerComposeFileNameAlt
|
||||
);
|
||||
const dbDockerComposeFile = path.join(appDir, "db.docker-compose.yml");
|
||||
const dbDockerComposeFileAlt = path.join(appDir, "db.docker-compose.yaml");
|
||||
const dbDockerComposeFile = path.join(appDir, dbDockerComposeFileName);
|
||||
const dbDockerComposeFileAlt = path.join(
|
||||
appDir,
|
||||
dbDockerComposeFileNameAlt
|
||||
);
|
||||
const dsqlDbDockerComposeFile = path.join(
|
||||
appDir,
|
||||
dsqlDbDockerComposeFileName
|
||||
);
|
||||
const dsqlDbDockerComposeFileAlt = path.join(
|
||||
appDir,
|
||||
dsqlDbDockerComposeFileNameAlt
|
||||
);
|
||||
|
||||
const extraDockerComposeFile = path.join(
|
||||
appDir,
|
||||
"extra.docker-compose.yml"
|
||||
@@ -282,6 +331,7 @@ export default function grabDirNames(param?: Param) {
|
||||
schemasBackupDirName,
|
||||
userMainShemaJSONFilePath,
|
||||
maxscaleSSLDir,
|
||||
maxscaleSSLCaCertFile,
|
||||
mainDBSSLDir,
|
||||
replica1DBSSLDir,
|
||||
replica2DBSSLDir,
|
||||
@@ -304,5 +354,13 @@ export default function grabDirNames(param?: Param) {
|
||||
distroEnterpriseExportTarName,
|
||||
communityDistroTempDir,
|
||||
communityDistroDir,
|
||||
installScriptFile,
|
||||
updateScriptFile,
|
||||
installTypescriptFile,
|
||||
updateTypescriptFile,
|
||||
dsqlDbDockerComposeFile,
|
||||
dsqlDbDockerComposeFileAlt,
|
||||
dsqlDbDockerComposeFileName,
|
||||
dsqlDbDockerComposeFileNameAlt,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import grabDockerResourceIPNumbers from "../../grab-docker-resource-ip-numbers";
|
||||
|
||||
export default function grabIPAddresses() {
|
||||
const globalIPPrefix = process.env.DSQL_NETWORK_IP_PREFIX || "172.72.0";
|
||||
|
||||
const {
|
||||
cron,
|
||||
db,
|
||||
@@ -19,6 +20,7 @@ export default function grabIPAddresses() {
|
||||
const maxScaleIP = `${globalIPPrefix}.${maxscale}`;
|
||||
const mainDBIP = `${globalIPPrefix}.${db}`;
|
||||
const webSocketIP = `${globalIPPrefix}.${websocket}`;
|
||||
const dbCronIP = `${globalIPPrefix}.${db_cron}`;
|
||||
const localHostIP = `${globalIPPrefix}.1`;
|
||||
|
||||
return {
|
||||
@@ -29,5 +31,6 @@ export default function grabIPAddresses() {
|
||||
localHostIP,
|
||||
globalIPPrefix,
|
||||
webSocketIP,
|
||||
dbCronIP,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user