GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-09 15:27:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

add upload server

Browse Source
This commit is contained in:
Luke Berndt
2024-09-08 09:57:44 -04:00
parent 1be715c042
commit 2cbc6929e8
10 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/System/System.js
View File

@@ -288,7 +288,7 @@ const System = () => {
'",\n\t\t\t"apiKey": "' +
system.key +
'"\n\t\t}\n\t],\n\t"uploadServer": "' +
process.env.REACT_APP_BACKEND_SERVER +
process.env.REACT_APP_UPLOAD_SERVER +
'"\n}';
switch (system.systemType) {

12
backend/controllers/groups.js
View File

@@ -1,13 +1 @@
const Group = require("../models/group");
exports.get_groups = async function (req, res) {
const grp_results = await Group.find({ shortName: req.params.shortName.toLowerCase()}).sort("position").catch(err => {
console.error(err);
res.status(500);
res.json({ success: false, message: err });
return;
});
res.contentType('json');
res.send(JSON.stringify(grp_results));
}

47
backend/controllers/talkgroups.js
View File

@@ -1,20 +1,53 @@
const Talkgroup = require("../models/talkgroup");
const Group = require("../models/group");
exports.get_talkgroups = async function (req, res) {
const tg_results = await Talkgroup.find({ 'shortName': req.params.shortName.toLowerCase()}).catch(err => {
let groups = {};
let talkgroups = {};
async function load_talkgroups(shortName) {
const tg_results = await Talkgroup.find({ 'shortName': shortName }).catch(err => {
console.error(err);
res.status(500);
res.json({ success: false, message: err });
return;
});
var talkgroups = {};
});
let temp = {}
for (var tg in tg_results) {
var talkgroup = {_id: tg_results[tg]._id, num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description}
talkgroups[tg_results[tg].num] = talkgroup;
var talkgroup = { _id: tg_results[tg]._id, num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description }
temp[tg_results[tg].num] = talkgroup;
}
return temp;
}
exports.get_talkgroups = async function (req, res) {
const shortName = req.params.shortName.toLowerCase();
/*
if (talkgroups.hasOwnProperty(shortName)) {
talkgroups = talkgroups[shortName];
} else {
}*/
let talkgroups = await load_talkgroups(shortName);
res.contentType('json');
res.send(JSON.stringify({
talkgroups: talkgroups
}));
}
exports.get_groups = async function (req, res) {
const shortName = req.params.shortName.toLowerCase();
const grp_results = await Group.find({ shortName: req.params.shortName.toLowerCase() }).sort("position").catch(err => {
console.error(err);
res.status(500);
res.json({ success: false, message: err });
return;
});
res.contentType('json');
res.send(JSON.stringify(grp_results));
}

4
backend/index.js
View File

@@ -6,7 +6,7 @@ var calls = require("./controllers/calls");
var uploads = require("./controllers/uploads");
var systems = require("./controllers/systems");
var talkgroups = require("./controllers/talkgroups");
var groups = require("./controllers/groups");
var stats = require("./controllers/stats");
var sys_stats = require("./sys_stats");
var events = require("./controllers/events");
@@ -130,7 +130,7 @@ app.post('/:shortName/authorize', systems.authorize_system);
app.get('/:shortName/talkgroups', talkgroups.get_talkgroups);
/*------ GROUPS ----------*/
app.get('/:shortName/groups', groups.get_groups);
app.get('/:shortName/groups', talkgroups.get_groups);
/*------ EVENTS ----------*/

2
certbot-compose.yml
View File

@@ -27,7 +27,7 @@ services:
- ${PWD}/data/certbot/conf/:/etc/letsencrypt/:rw
entrypoint: "certbot certonly --webroot -w /var/www/certbot \
--email ${REACT_APP_ADMIN_EMAIL} \
-d ${DOMAIN_NAME} -d www.${DOMAIN_NAME} -d api.${DOMAIN_NAME} -d admin.${DOMAIN_NAME} -d account.${DOMAIN_NAME} \
-d ${DOMAIN_NAME} -d www.${DOMAIN_NAME} -d api.${DOMAIN_NAME} -d admin.${DOMAIN_NAME} -d account.${DOMAIN_NAME} -d upload.${DOMAIN_NAME}\
--rsa-key-size 4096 \
--agree-tos \
--force-renewal"

2
docker-compose.yml
View File

@@ -104,6 +104,7 @@ services:
context: ./admin
args:
- REACT_APP_BACKEND_SERVER
- REACT_APP_UPLOAD_SERVER
- REACT_APP_ADMIN_SERVER
- REACT_APP_ACCOUNT_SERVER
- REACT_APP_FRONTEND_SERVER
@@ -113,6 +114,7 @@ services:
image: "admin:${TAG}-${STAGE}"
environment:
- REACT_APP_BACKEND_SERVER
- REACT_APP_UPLOAD_SERVER
- REACT_APP_ADMIN_SERVER
- REACT_APP_ACCOUNT_SERVER
- REACT_APP_FRONTEND_SERVER

28
nginx-proxy/prod/vhosts/site.template
View File

@@ -52,6 +52,34 @@ server {
}
}
server {
listen 443 ssl;
ssl_certificate /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/${DOMAIN_NAME}/privkey.pem;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_prefer_server_ciphers on;
ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
ssl_session_timeout 1d;
ssl_session_cache shared:SSL:50m;
ssl_stapling on;
ssl_stapling_verify on;
add_header Strict-Transport-Security max-age=15768000;
server_name upload.${DOMAIN_NAME};
location /~*/upload {
proxy_pass http://backend:3005;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
include /etc/nginx/proxy.conf;
access_log off;
}
}
server {
listen 443 ssl;
ssl_certificate /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem;

21
nginx-proxy/test/vhosts/site.template
View File

@@ -83,3 +83,24 @@ server {
access_log off;
}
}
server {
listen 80;
server_name upload.${DOMAIN_NAME};
location /.well-known/acme-challenge/ {
root /var/www/certbot;
}
location /~*/upload {
proxy_pass http://backend:3005;
include /etc/nginx/proxy.conf;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
access_log off;
}
}

1
prod.env.example
View File

@@ -17,6 +17,7 @@ export NODE_ENV="production"
export PROTOCOL="https://"
export REACT_APP_BACKEND_SERVER="${PROTOCOL}api.${DOMAIN_NAME}"
export REACT_APP_UPLOAD_SERVER="${PROTOCOL}upload.${DOMAIN_NAME}"
export REACT_APP_FRONTEND_SERVER="${PROTOCOL}${DOMAIN_NAME}"
export REACT_APP_ACCOUNT_SERVER="${PROTOCOL}account.${DOMAIN_NAME}"
export REACT_APP_ADMIN_SERVER="${PROTOCOL}admin.${DOMAIN_NAME}"

1
test.env.example
View File

@@ -17,6 +17,7 @@ export NODE_ENV="test"
export PROTOCOL="http://"
export REACT_APP_BACKEND_SERVER="${PROTOCOL}api.${DOMAIN_NAME}"
export REACT_APP_UPLOAD_SERVER="${PROTOCOL}upload.${DOMAIN_NAME}"
export REACT_APP_FRONTEND_SERVER="${PROTOCOL}${DOMAIN_NAME}"
export REACT_APP_ACCOUNT_SERVER="${PROTOCOL}account.${DOMAIN_NAME}"
export REACT_APP_ADMIN_SERVER="${PROTOCOL}admin.${DOMAIN_NAME}"