diff --git a/server/app_cfg.js b/server/app_cfg.js index 4b8f0c7..4e30eca 100644 --- a/server/app_cfg.js +++ b/server/app_cfg.js @@ -17,10 +17,7 @@ app_cfg.global = { defaultuserip: '127.0.0.1', ip_auth_range: ['::ffff:172.16.5.0/24', '::ffff:192.168.2.0/24'], saltRounds: 10, - sessionsecret: '0987654321abcdef#xyz', - backup_rmld_to_mail: true, - backup_rmld_to_file: true, - backup_path: '/misc/bkp/' + sessionsecret: '0987654321abcdef#xyz' }; // Einstellungen zur Erscheinung der Seite @@ -37,21 +34,36 @@ app_cfg.public = { 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 = { enabled: true, secret: 'asdfwert1234567890#', 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 = { enabled: true, host: 'https://192.168.1.25:8090/api', - secret: 'asdfwert1234567890#', - // FIXME in api rausfiltern - get_mission_type: ['Brandeinsatz', 'Hilfeleistung'], - get_data_type: ['uuid', 'nummer', 'alarmzeit', 'art', 'stichwort', 'sondersignal', 'ort', 'ortsteil', 'wgs84_area'] + secret: 'asdfwert1234567890#' }; +// Einstellungen um Daten in Socket-Schnittstelle zu filtern (Datenschutzoption) +app_cfg.filter = { + // FIXME in api rausfiltern + send_missiontype: ['Brandeinsatz', 'Hilfeleistung'], + 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; \ No newline at end of file diff --git a/server/waip.js b/server/waip.js index 602df94..632f6d7 100755 --- a/server/waip.js +++ b/server/waip.js @@ -388,9 +388,9 @@ module.exports = function (io, sql, fs, brk, async, app_cfg, api, proof) { } else { // CSV Dateiname und Pfad festlegen 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 - if (app_cfg.global.backup_rmld_to_file) { + if (app_cfg.rmld.backup_to_file) { // CSV speichern fs.writeFile(csv_filename, csv, function (err) {