aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-10-06 14:54:08 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-10-06 14:54:08 +1300
commit21d69f45cd5badf52e175fc234c5c7bd3c2aeb35 (patch)
tree9073d3abc9ec9cf5faae595aba5c516ad4b03efc
parent2b22e09688ea303b4c9fc2f5f5dda59ec00573ae (diff)
parentb186e95953f7af67ce17958cdb666044b57b78d9 (diff)
downloadtrackermap-server-21d69f45cd5badf52e175fc234c5c7bd3c2aeb35.tar.gz
trackermap-server-21d69f45cd5badf52e175fc234c5c7bd3c2aeb35.tar.bz2
trackermap-server-21d69f45cd5badf52e175fc234c5c7bd3c2aeb35.zip
Merge pull request #901 from jon-stumpf/sync-config-files
Sync configuration files
-rw-r--r--default.cfg8
-rw-r--r--opengts.cfg22
-rw-r--r--setup/linux/traccar.cfg27
-rw-r--r--setup/macosx/traccar.cfg27
-rw-r--r--setup/windows/traccar.cfg27
5 files changed, 93 insertions, 18 deletions
diff --git a/default.cfg b/default.cfg
index 7e64b0216..a684f7631 100644
--- a/default.cfg
+++ b/default.cfg
@@ -4,7 +4,7 @@
<properties>
- <!-- Global confiduration -->
+ <!-- Global configuration -->
<!--<entry key='database.driverFile'>/home/user/Documents/traccar/hsqldb.jar</entry>-->
<entry key='database.driver'>org.h2.Driver</entry>
<entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
@@ -55,8 +55,7 @@
<entry key='geocoder.enable'>false</entry>
<entry key='geocoder.type'>nominatim</entry>
<entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
- <entry key='geocoder.type'>nominatim</entry>
-
+
<!-- Filtering options -->
<!--<entry key='filter.enable'>true</entry>
<entry key='filter.limit'>3600</entry>
@@ -71,7 +70,6 @@
<!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
- <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -109,7 +107,6 @@
<!-- Meiligao server configuration -->
<entry key='meiligao.enable'>true</entry>
<entry key='meiligao.port'>5009</entry>
- <!--<entry key='meiligao.server'>127.0.0.1:5009</entry>-->
<!-- Maxon server configuration -->
<entry key='maxon.enable'>true</entry>
@@ -166,7 +163,6 @@
<!-- GT06 server configuration -->
<entry key='gt06.enable'>true</entry>
<entry key='gt06.port'>5023</entry>
- <entry key='gt06.timezone'>7200</entry>
<!-- Megastek server configuration -->
<entry key='megastek.enable'>true</entry>
diff --git a/opengts.cfg b/opengts.cfg
index 16deb38ec..6d632edd4 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -4,7 +4,7 @@
<properties>
- <!-- Global confiduration -->
+ <!-- Global configuration -->
<entry key='database.driver'>com.mysql.jdbc.Driver</entry>
<entry key='database.url'>jdbc:mysql://localhost:3306/[DATABASE]?allowMultiQueries=true</entry>
<entry key='database.user'>[USER]</entry>
@@ -27,18 +27,26 @@
DO 0;
</entry>
- <!-- Web interface port -->
+ <!-- Web interface -->
<entry key='http.enable'>false</entry>
<!-- Geocoder options -->
<entry key='geocoder.enable'>true</entry>
+ <entry key='geocoder.type'>google</entry>
+
+ <!-- Filtering options -->
+ <!--<entry key='filter.enable'>true</entry>
+ <entry key='filter.limit'>3600</entry>
+ <entry key='filter.invalid'>true</entry>
+ <entry key='filter.zero'>true</entry>
+ <entry key='filter.duplicate'>true</entry>
+ <entry key='filter.distance'>50</entry>-->
<!-- Logging options -->
<entry key='logger.enable'>false</entry>
<!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
- <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -317,4 +325,12 @@
<entry key='visiontek.enable'>true</entry>
<entry key='visiontek.port'>5069</entry>
+ <!-- Orion server configuration -->
+ <entry key='orion.enable'>true</entry>
+ <entry key='orion.port'>5070</entry>
+
+ <!-- Riti server configuration -->
+ <entry key='riti.enable'>true</entry>
+ <entry key='riti.port'>5071</entry>
+
</properties>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 52c99b315..74bb6a97f 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -4,7 +4,7 @@
<properties>
- <!-- Global confiduration -->
+ <!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
<entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:/opt/traccar/data/database</entry>
@@ -44,18 +44,31 @@
UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
</entry>
- <!-- Web interface port -->
+ <!-- Web interface -->
<entry key='http.enable'>true</entry>
+ <!--<entry key='http.address'></entry>-->
<entry key='http.port'>8082</entry>
<entry key='http.application'>/opt/traccar/traccar-web.war</entry>
+ <!-- Geocoder options -->
+ <entry key='geocoder.enable'>false</entry>
+ <entry key='geocoder.type'>nominatim</entry>
+ <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+ <!-- Filtering options -->
+ <!--<entry key='filter.enable'>true</entry>
+ <entry key='filter.limit'>3600</entry>
+ <entry key='filter.invalid'>true</entry>
+ <entry key='filter.zero'>true</entry>
+ <entry key='filter.duplicate'>true</entry>
+ <entry key='filter.distance'>50</entry>-->
+
<!-- Logging options -->
<entry key='logger.enable'>true</entry>
<entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
<!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
- <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -334,4 +347,12 @@
<entry key='visiontek.enable'>true</entry>
<entry key='visiontek.port'>5069</entry>
+ <!-- Orion server configuration -->
+ <entry key='orion.enable'>true</entry>
+ <entry key='orion.port'>5070</entry>
+
+ <!-- Riti server configuration -->
+ <entry key='riti.enable'>true</entry>
+ <entry key='riti.port'>5071</entry>
+
</properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 52c99b315..74bb6a97f 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -4,7 +4,7 @@
<properties>
- <!-- Global confiduration -->
+ <!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
<entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:/opt/traccar/data/database</entry>
@@ -44,18 +44,31 @@
UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
</entry>
- <!-- Web interface port -->
+ <!-- Web interface -->
<entry key='http.enable'>true</entry>
+ <!--<entry key='http.address'></entry>-->
<entry key='http.port'>8082</entry>
<entry key='http.application'>/opt/traccar/traccar-web.war</entry>
+ <!-- Geocoder options -->
+ <entry key='geocoder.enable'>false</entry>
+ <entry key='geocoder.type'>nominatim</entry>
+ <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+ <!-- Filtering options -->
+ <!--<entry key='filter.enable'>true</entry>
+ <entry key='filter.limit'>3600</entry>
+ <entry key='filter.invalid'>true</entry>
+ <entry key='filter.zero'>true</entry>
+ <entry key='filter.duplicate'>true</entry>
+ <entry key='filter.distance'>50</entry>-->
+
<!-- Logging options -->
<entry key='logger.enable'>true</entry>
<entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
<!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
- <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -334,4 +347,12 @@
<entry key='visiontek.enable'>true</entry>
<entry key='visiontek.port'>5069</entry>
+ <!-- Orion server configuration -->
+ <entry key='orion.enable'>true</entry>
+ <entry key='orion.port'>5070</entry>
+
+ <!-- Riti server configuration -->
+ <entry key='riti.enable'>true</entry>
+ <entry key='riti.port'>5071</entry>
+
</properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 879f3e438..781592f9e 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -4,7 +4,7 @@
<properties>
- <!-- Global confiduration -->
+ <!-- Global configuration -->
<entry key='database.driver'>org.h2.Driver</entry>
<entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
<entry key='database.url'>jdbc:h2:[DATABASE]</entry>
@@ -44,18 +44,31 @@
UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
</entry>
- <!-- Web interface port -->
+ <!-- Web interface -->
<entry key='http.enable'>true</entry>
+ <!--<entry key='http.address'></entry>-->
<entry key='http.port'>8082</entry>
<entry key='http.application'>[WAR]</entry>
+ <!-- Geocoder options -->
+ <entry key='geocoder.enable'>false</entry>
+ <entry key='geocoder.type'>nominatim</entry>
+ <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+ <!-- Filtering options -->
+ <!--<entry key='filter.enable'>true</entry>
+ <entry key='filter.limit'>3600</entry>
+ <entry key='filter.invalid'>true</entry>
+ <entry key='filter.zero'>true</entry>
+ <entry key='filter.duplicate'>true</entry>
+ <entry key='filter.distance'>50</entry>-->
+
<!-- Logging options -->
<entry key='logger.enable'>true</entry>
<entry key='logger.file'>[LOG]</entry>
<!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
- <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -334,4 +347,12 @@
<entry key='visiontek.enable'>true</entry>
<entry key='visiontek.port'>5069</entry>
+ <!-- Orion server configuration -->
+ <entry key='orion.enable'>true</entry>
+ <entry key='orion.port'>5070</entry>
+
+ <!-- Riti server configuration -->
+ <entry key='riti.enable'>true</entry>
+ <entry key='riti.port'>5071</entry>
+
</properties>