krgamestudios/MERN-template
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UNTESTED: Added database port as a configurable option

Browse Source 
Also updated license field in package.json
This commit is contained in:
Kayne Ruse
2024-04-15 21:02:58 +10:00
parent 42fa9e27e7
commit 90a4fc1a6a
6 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.envdev
+2
View File
@@ -1,6 +1,8 @@
WEB_PORT=3000
DB_HOSTNAME=localhost
DB_PORTNAME=3306
DB_DATABASE=template
DB_USERNAME=template
DB_PASSWORD=pikachu
configure-script.js
+91 -16
View File
@@ -36,7 +36,7 @@ const question = (prompt, def = null) => {
Currently, all microservices are mandatory; you'll have to mess with the result
and the source code if you wish to be more selective. Microservices currently
impelented are:
implemented are:
* auth-server
* news-server
@@ -49,7 +49,7 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
//determine local computer address for mac user vs everyone else
let macUser = '';
while (macUser.toLowerCase() !== 'yes' && macUser.toLowerCase() !== 'no') {
macUser = await question('Will the MERN Template be running locally on a MacOS system? (yes or no)', '');
macUser = await question('Will the MERN-Template be running locally on a MacOS system? (yes or no, this only alters startup.sql)', '');
}
const localAddress = macUser ? 'localhost' : '%';
@@ -58,12 +58,47 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
const projectName = await question('Project Name', 'template');
const projectWebAddress = await question('Project Web Address', 'example.com');
let projectDBLocation = '';
while (typeof projectDBLocation != 'string' || /^[le]/i.test(projectDBLocation[0]) == false) {
projectDBLocation = await question('Project [l]ocal or [e]xternal database?');
}
let projectDBHost = '';
let projectDBPort = '';
if (/^[l]/i.test(projectDBLocation[0])) {
projectDBHost = 'database';
projectDBPort = '3306';
}
else {
projectDBHost = await question('Project DB Host');
projectDBPort = await question('Project DB Port', '3306');
}
const projectDBUser = await question('Project DB Username', projectName);
const projectDBPass = await question('Project DB Password', 'pikachu');
//news configuration
const newsName = await question('News Name', 'news');
const newsWebAddress = await question('News Web Address', `${newsName}.${projectWebAddress}`);
let newsDBLocation = '';
while (typeof newsDBLocation != 'string' || /^[le]/i.test(newsDBLocation[0]) == false) {
newsDBLocation = await question('News [l]ocal or [e]xternal database?');
}
let newsDBHost = '';
let newsDBPort = '';
if (/^[l]/i.test(newsDBLocation[0])) {
newsDBHost = 'database';
newsDBPort = '3306';
}
else {
newsDBHost = await question('News DB Host');
newsDBPort = await question('News DB Port', '3306');
}
const newsDBUser = await question('News DB Username', newsName);
const newsDBPass = await question('News DB Password', 'venusaur');
@@ -72,6 +107,24 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
const authWebAddress = await question('Auth Web Address', `${authName}.${projectWebAddress}`);
const authPostValidationHookArray = await question('Auth Post Validation Hook Array', '');
const authResetAddress = await question('Auth Reset Addr', `${projectWebAddress}/reset`);
let authDBLocation = '';
while (typeof authDBLocation != 'string' || /^[le]/i.test(authDBLocation[0]) == false) {
authDBLocation = await question('Auth [l]ocal or [e]xternal database?');
}
let authDBHost = '';
let authDBPort = '';
if (/^[l]/i.test(authDBLocation[0])) {
authDBHost = 'database';
authDBPort = '3306';
}
else {
authDBHost = await question('Auth DB Host');
authDBPort = await question('Auth DB Port', '3306');
}
const authDBUser = await question('Auth DB Username', authName);
const authDBPass = await question('Auth DB Password', 'charizard');
@@ -83,6 +136,24 @@ See https://github.com/krgamestudios/MERN-template/wiki for help.
//chat goes here
const chatName = await question('Chat Name', 'chat');
const chatWebAddress = await question('Chat Web Address', `${chatName}.${projectWebAddress}`);
let chatDBLocation = '';
while (typeof chatDBLocation != 'string' || /^[le]/i.test(chatDBLocation[0]) == false) {
chatDBLocation = await question('Chat [l]ocal or [e]xternal database?');
}
let chatDBHost = '';
let chatDBPort = '';
if (/^[l]/i.test(chatDBLocation[0])) {
chatDBHost = 'database';
chatDBPort = '3306';
}
else {
chatDBHost = await question('Chat DB Host');
chatDBPort = await question('Chat DB Port', '3306');
}
const chatDBUser = await question('Chat DB Username', chatName);
const chatDBPass = await question('Chat DB Password', 'blastoise');
@@ -134,7 +205,8 @@ services:
- traefik.http.services.${projectName}service.loadbalancer.server.port=${projectPort}
environment:
- WEB_PORT=${projectPort}
- DB_HOSTNAME=database
- DB_HOSTNAME=${projectDBHost}
- DB_PORTNAME=${projectDBPort}
- DB_DATABASE=${projectName}
- DB_USERNAME=${projectDBUser}
- DB_PASSWORD=${projectDBPass}
@@ -145,8 +217,8 @@ services:
- SECRET_ACCESS=${accessToken}
networks:
- app-network
depends_on:
- database
depends_on:${ projectDBHost != 'database' ? '' : `
- database`}
- traefik
${newsName}:
@@ -162,7 +234,8 @@ services:
- traefik.http.services.${newsName}service.loadbalancer.server.port=${newsPort}
environment:
- WEB_PORT=${newsPort}
- DB_HOSTNAME=database
- DB_HOSTNAME=${newsDBHost}
- DB_PORTNAME=${newsDBPort}
- DB_DATABASE=${newsName}
- DB_USERNAME=${newsDBUser}
- DB_PASSWORD=${newsDBPass}
@@ -171,8 +244,8 @@ services:
- SECRET_ACCESS=${accessToken}
networks:
- app-network
depends_on:
- database
depends_on:${ newsDBHost != 'database' ? '' : `
- database`}
- traefik
${authName}:
@@ -192,7 +265,8 @@ services:
- HOOK_POST_VALIDATION_ARRAY=${authPostValidationHookArray}
- WEB_RESET_ADDRESS=${authResetAddress}
- WEB_PORT=${authPort}
- DB_HOSTNAME=database
- DB_HOSTNAME=${authDBHost}
- DB_PORTNAME=${authDBPort}
- DB_DATABASE=${authName}
- DB_USERNAME=${authDBUser}
- DB_PASSWORD=${authDBPass}
@@ -207,8 +281,8 @@ services:
- SECRET_REFRESH=${refreshToken}
networks:
- app-network
depends_on:
- database
depends_on:${ authDBHost != 'database' ? '' : `
- database`}
- traefik
${chatName}:
@@ -224,7 +298,8 @@ services:
- traefik.http.services.${chatName}service.loadbalancer.server.port=${chatPort}
environment:
- WEB_PORT=${chatPort}
- DB_HOSTNAME=database
- DB_HOSTNAME=${chatDBHost}
- DB_PORTNAME=${chatDBPort}
- DB_DATABASE=${chatName}
- DB_USERNAME=${chatDBUser}
- DB_PASSWORD=${chatDBPass}
@@ -232,10 +307,10 @@ services:
- SECRET_ACCESS=${accessToken}
networks:
- app-network
depends_on:
- database
depends_on:${ chatDBHost != 'database' ? '' : `
- database`}
- traefik
${ [projectDBHost, newsDBHost, authDBHost, chatDBHost].some(x => x == "database") == false ? '' : `
database:
image: mariadb
restart: always
@@ -246,7 +321,7 @@ services:
- ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro
networks:
- app-network
`}
traefik:
image: traefik:v2.10
container_name: traefik
package-lock.json
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
"": {
"name": "mern-template",
"version": "1.5.1",
"license": "ISC",
"license": "Zlib",
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
package.json
+1 -1
View File
@@ -21,7 +21,7 @@
"url": "git+https://github.com/KRGameStudios/MERN-template.git"
},
"author": "Kayne Ruse",
"license": "ISC",
"license": "Zlib",
"bugs": {
"url": "https://github.com/KRGameStudios/MERN-template/issues"
},
server/database/index.js
+1 -2
View File
@@ -2,11 +2,10 @@ const Sequelize = require('sequelize');
const sequelize = new Sequelize(process.env.DB_DATABASE, process.env.DB_USERNAME, process.env.DB_PASSWORD, {
host: process.env.DB_HOSTNAME,
port: process.env.DB_PORTNAME,
dialect: 'mariadb',
timezone: process.env.DB_TIMEZONE,
logging: process.env.DB_LOGGING ? console.log : false
});
sequelize.sync();
module.exports = sequelize;
server/server.js
+1
View File
@@ -42,4 +42,5 @@ app.get('*', (req, res) => {
server.listen(process.env.WEB_PORT || 3000, async (err) => {
await database.sync();
console.log(`listening to localhost:${process.env.WEB_PORT || 3000}`);
console.log(`database located at ${process.env.DB_HOSTNAME || '<default>'}:${process.env.DB_PORTNAME || '<default>'}`);
});