Merge branch 'refs/heads/pr/106' into develop

# Conflicts:
#	config/config.template.ini
This commit is contained in:
Bastian Schroll 2016-10-01 11:22:17 +02:00
commit 6c2ec0c4df
2 changed files with 145 additions and 0 deletions

View file

@ -129,6 +129,7 @@ notifyMyAndroid = 0
Sms77 = 0
FFAgent = 0
Pushover = 0
Telegram = 0
# for developing template-module
template = 0
@ -291,6 +292,7 @@ appName = BOSWatch
# configuration loaded from csv/nma.csv
usecsv = 0
[SMS]
# be aware that you need 'gammu' installed and running
# at least you need an UMTS-stick which is supported by 'gammu'
@ -383,6 +385,20 @@ expire = 90
html = 1
[Telegram]
# This is your unique BOT token. You will get it from the BotFather once you have created your BOT.
BOTTokenAPIKey =
# Create a group chat with your BOT and enter the chat ID here.
# The plugin will send messages as your BOT and post everything in this group chat.
BOTChatIDAPIKey =
# The plugin can extract a location from the POCSAG message.
# However, this will be done for the following RIC only (7 digits e.g. 0012345).
RICforLocationAPIKey =
# This is your Google API key.
# Required if you want to create a map based on location information received with the above RIC.
GoogleAPIKey =
#####################
##### Not ready yet #
#####################