Merge branch 'master'

Conflicts:
	config/config.template.ini
	install.sh
This commit is contained in:
Bastian Schroll 2016-10-02 11:48:28 +02:00
commit 50303b79fc
2 changed files with 21 additions and 21 deletions

View file

@ -29,7 +29,7 @@ backupCount = 7
# so don't use it for one rapid Plugin
processAlarmAsync = 0
# Using RegEx-Filter (0|1)
# Using RegEx-Filter (0 - off | 1 - on)
# Filter-configuration in section [Filters]
useRegExFilter = 0
@ -41,7 +41,7 @@ doubleFilter_ignore_entries = 10
# time to ignore same alarm (only ID is checked) (sek)
doubleFilter_ignore_time = 5
# ignore msg is only usefull for POCSAG (0|1)
# ignore msg is only usefull for POCSAG (0 - off | 1 - on)
# 0: double check ignores the msg-text (only check ID + function)
# 1: if you want to differentiate between with/ without msg
# f.e. if they use quick-alarm (without text, then same ric with msg)
@ -69,13 +69,13 @@ appName = BOSWatch
[FMS]
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/fms.csv
idDescribed = 0
[ZVEI]
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/zvei.csv
idDescribed = 0
@ -94,7 +94,7 @@ filter_range_start = 0000000
filter_range_end = 9999999
# look-up-table for adding a description
# Using Description (0|1)
# Using Description (0 - off | 1 - on)
# descriptions loaded from csv/poc.csv
idDescribed = 0
@ -118,7 +118,7 @@ idDescribed = 0
[Plugins]
# can take on or off the plugins (0|1)
# turn the plugins on or off (0 - off | 1 - on)
MySQL = 0
httpRequest = 0
eMail = 0