mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Di 9. Jun 10:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-09 10:31:01 +02:00
parent 1e76440123
commit e78401d097
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
server/app_cfg.js
View File

@ -2,54 +2,55 @@ var app_cfg = {};
// Server-Einstellungen // Server-Einstellungen
app_cfg.global = { app_cfg.global = {
development: true, development: true,
http_port: 3000, http_port: 3000,
https_port: 3443, https_port: 3443,
udpport: 60233, udpport: 60233,
database: './database.sqlite3', database: './database.sqlite3',
soundpath: '/public/media/', soundpath: '/public/media/',
mediapath: '/media/', mediapath: '/media/',
time_to_delete_waip: 60, time_to_delete_waip: 60,
default_time_for_standby: 10, default_time_for_standby: 10,
circumcircle: 5, circumcircle: 5,
defaultuser: 'me', defaultuser: 'me',
defaultpass: '123', defaultpass: '123',
defaultuserip: '127.0.0.1', defaultuserip: '127.0.0.1',
ip_auth_range: ['::ffff:172.16.5.0/24', '::ffff:192.168.2.0/24'], ip_auth_range: ['::ffff:172.16.5.0/24', '::ffff:192.168.2.0/24'],
saltRounds: 10, saltRounds: 10,
sessionsecret: '0987654321abcdef#xyz', sessionsecret: '0987654321abcdef#xyz',
backup_rmld: true, backup_rmld_to_mail: true,
backup_path: '/misc/bkp/' backup_rmld_to_file: true,
backup_path: '/misc/bkp/'
}; };
// Einstellungen zur Erscheinung der Seite // Einstellungen zur Erscheinung der Seite
app_cfg.public = { app_cfg.public = {
url: 'https://wachalarm.info.tm', url: 'https://wachalarm.info.tm',
app_name: 'Wachalarm IP-Web', app_name: 'Wachalarm IP-Web',
company: 'Leitstelle Lausitz', company: 'Leitstelle Lausitz',
version: 'Version 1.2', version: 'Version 1.2',
map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
map_attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', map_attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
ext_imprint: false, ext_imprint: false,
url_imprint: 'https://www.nix.nix/impressium', url_imprint: 'https://www.nix.nix/impressium',
ext_privacy: false, ext_privacy: false,
url_privacy: 'https://www.nix.nix/datenschutz' url_privacy: 'https://www.nix.nix/datenschutz'
}; };
// Daten von anderen Servern empfangen // Daten von anderen Servern empfangen
app_cfg.api = { app_cfg.api = {
enabled: true, enabled: true,
secret: 'asdfwert1234567890#', secret: 'asdfwert1234567890#',
access_list: ['192.168.2.20', '192.168.2.30'] access_list: ['192.168.2.20', '192.168.2.30'],
send_mission_type: ['Brandeinsatz', 'Hilfeleistung'],
send_data_type: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area']
}; };
// Daten an andere Server senden // Daten an andere Server senden
app_cfg.endpoint = { app_cfg.endpoint = {
enabled: true, enabled: true,
host: 'https://192.168.1.25:8090/api', host: 'https://192.168.1.25:8090/api',
secret: 'asdfwert1234567890#', secret: 'asdfwert1234567890#'
send_mission_type: ['Brandeinsatz', 'Hilfeleistung'],
send_data_type: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area']
}; };
module.exports = app_cfg; module.exports = app_cfg;

2
server/sql_qry.js
View File

@ -299,6 +299,8 @@ module.exports = function (db, uuidv4, app_cfg) {
function db_einsatz_loeschen(id) { function db_einsatz_loeschen(id) {
// Einsatz loeschen // Einsatz loeschen
// TODO alle Rüueckmeldungen zu dem Einsatz aus db löschen
// TODO alle Historys zu dem Einsatz aus db löschen
db.run(`DELETE FROM waip_einsaetze WHERE id = ?`, [id]); db.run(`DELETE FROM waip_einsaetze WHERE id = ?`, [id]);
}; };