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

update Sa 13. Jun 17:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-13 17:01:01 +02:00
parent a604eac2bf
commit 9afac7e4ad
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/app_cfg.js
View File

@ -17,10 +17,7 @@ app_cfg.global = {
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_to_mail: true,
backup_rmld_to_file: true,
backup_path: '/misc/bkp/'
}; };
// Einstellungen zur Erscheinung der Seite // Einstellungen zur Erscheinung der Seite
@ -37,21 +34,36 @@ app_cfg.public = {
url_privacy: 'https://www.nix.nix/datenschutz' url_privacy: 'https://www.nix.nix/datenschutz'
}; };
// Daten von anderen Clients empfangen // Einstellungen fuer Rueckmeldungen
app_cfg.rmld = {
backup_to_mail: true,
backup_to_file: true,
backup_path: '/misc/bkp/'
};
// Socket-Schnittstelle um Daten von anderen Clients zu 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']
}; };
// Daten an andere Server senden // Socket-Schnittstelle um Daten an andere Server zu 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#'
};
// Einstellungen um Daten in Socket-Schnittstelle zu filtern (Datenschutzoption)
app_cfg.filter = {
// FIXME in api rausfiltern // FIXME in api rausfiltern
get_mission_type: ['Brandeinsatz', 'Hilfeleistung'], send_missiontype: ['Brandeinsatz', 'Hilfeleistung'],
get_data_type: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area'] send_missiondata: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area'],
send_resourcedata: ['*'],
receive_missiontype: ['Brandeinsatz', 'Hilfeleistung'],
receive_missiondata: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area'],
receive_resourcedata: ['*'],
}; };
module.exports = app_cfg; module.exports = app_cfg;

4
server/waip.js
View File

@ -388,9 +388,9 @@ module.exports = function (io, sql, fs, brk, async, app_cfg, api, proof) {
} else { } else {
// CSV Dateiname und Pfad festlegen // CSV Dateiname und Pfad festlegen
var csv_filename = part_rmld[0].einsatznummer + '_export_rmld_' + export_data.export_name + '.csv'; var csv_filename = part_rmld[0].einsatznummer + '_export_rmld_' + export_data.export_name + '.csv';
csv_filename = process.cwd() + app_cfg.global.backup_path + csv_filename; csv_filename = process.cwd() + app_cfg.rmld.backup_path + csv_filename;
// CSV in Backup-Ordner speichern, falls aktiviert // CSV in Backup-Ordner speichern, falls aktiviert
if (app_cfg.global.backup_rmld_to_file) { if (app_cfg.rmld.backup_to_file) {
// CSV speichern // CSV speichern
fs.writeFile(csv_filename, csv, function (err) { fs.writeFile(csv_filename, csv, function (err) {