Merge pull request #901 from jon-stumpf/sync-config-files

Sync configuration files

3 files changed, 72 insertions, 9 deletions

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>