Merge branch 'traccar:master' into master

mr-wolf-gb · Apr 23, 2024 · 1a22188 · 1a22188
2 parents 04dd6ca + 35ae557
commit 1a22188
Show file tree

Hide file tree

Showing 37 changed files with 829 additions and 442 deletions.
diff --git a/build.gradle b/build.gradle
@@ -110,7 +110,7 @@ jar {
     manifest {
         attributes(
                 "Main-Class": "org.traccar.Main",
-                "Implementation-Version": "6.0",
+                "Implementation-Version": "6.1",
                 "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" "))
     }
 }
diff --git a/debug.xml b/debug.xml
@@ -1,11 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
 <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
-
 <properties>
 
-    <entry key='config.default'>./setup/default.xml</entry>
-
     <entry key='web.path'>./traccar-web/simple</entry>
     <entry key='web.debug'>true</entry>
     <entry key='web.console'>true</entry>

diff --git a/setup/cloud-init.yaml b/setup/cloud-init.yaml
@@ -5,14 +5,10 @@ write_files:
       <?xml version='1.0' encoding='UTF-8'?>
       <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
       <properties>
-
-        <entry key="config.default">./conf/default.xml</entry>
-  
         <entry key='database.driver'>com.mysql.jdbc.Driver</entry>
         <entry key='database.url'>jdbc:mysql://localhost/traccar?zeroDateTimeBehavior=round&amp;serverTimezone=UTC&amp;allowPublicKeyRetrieval=true&amp;useSSL=false&amp;allowMultiQueries=true&amp;autoReconnect=true&amp;useUnicode=yes&amp;characterEncoding=UTF-8&amp;sessionVariables=sql_mode=''</entry>
         <entry key='database.user'>root</entry>
         <entry key='database.password'>root</entry>
-
       </properties>
     path: /root/traccar.xml
 

diff --git a/setup/default.xml b/setup/default.xml
diff --git a/setup/package.sh b/setup/package.sh
@@ -88,7 +88,6 @@ prepare () {
   cp ../schema/* out/schema
   cp -r ../templates/* out/templates
   cp -r ../traccar-web/build/* out/web
-  cp default.xml out/conf
   cp traccar.xml out/conf
 
   if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then

diff --git a/setup/traccar.iss b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=6.0
+AppVersion=6.1
 DefaultDirName={pf}\Traccar
 OutputBaseFilename=traccar-setup
 ArchitecturesInstallIn64BitMode=x64

diff --git a/setup/traccar.xml b/setup/traccar.xml
@@ -1,22 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
 <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
-
 <properties>
 
-    <entry key='config.default'>./conf/default.xml</entry>
-
-    <!--
-
-    This is the main configuration file. All your configuration parameters should be placed in this file.
-
-    Default configuration parameters are located in the "default.xml" file. You should not modify it to avoid issues
-    with upgrading to a new version. Parameters in the main config file override values in the default file. Do not
-    remove "config.default" parameter from this file unless you know what you are doing.
-
-    For list of available parameters see following page: https://www.traccar.org/configuration-file/
-
-    -->
+    <!-- Documentation: https://www.traccar.org/configuration-file/ -->
 
     <entry key='database.driver'>com.mysql.cj.jdbc.Driver</entry>
     <entry key='database.url'>jdbc:mysql://localhost/[DATABASE_NAME]?serverTimezone=Africa/Tunis&amp;useSSL=false&amp;allowMultiQueries=true&amp;autoReconnect=true&amp;useUnicode=yes&amp;characterEncoding=UTF-8&amp;sessionVariables=sql_mode=''</entry>

diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
@@ -191,7 +191,7 @@ public static OpenIdProvider provideOpenIDProvider(
 
     @Provides
     public static WebServer provideWebServer(Injector injector, Config config) {
-        if (config.hasKey(Keys.WEB_PORT)) {
+        if (config.getInteger(Keys.WEB_PORT) > 0) {
             return new WebServer(injector, config);
         }
         return null;
@@ -201,7 +201,7 @@ public static WebServer provideWebServer(Injector injector, Config config) {
     @Provides
     public static Geocoder provideGeocoder(Config config, Client client, StatisticsManager statisticsManager) {
         if (config.getBoolean(Keys.GEOCODER_ENABLE)) {
-            String type = config.getString(Keys.GEOCODER_TYPE, "google");
+            String type = config.getString(Keys.GEOCODER_TYPE);
             String url = config.getString(Keys.GEOCODER_URL);
             String key = config.getString(Keys.GEOCODER_KEY);
             String language = config.getString(Keys.GEOCODER_LANGUAGE);