Merge branch 'master' of https://github.com/traccar/traccar

4 files changed, 64 insertions, 9 deletions

diff --git a/setup/cloud-init.yaml b/setup/cloud-init.yaml
new file mode 100644
index 000000000..1246fb1b7
--- /dev/null
+++ b/setup/cloud-init.yaml
@@ -0,0 +1,29 @@
+#cloud-config
+
+write_files:
+  - content: |
+      <?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
+
+package_update: true
+packages:
+  - unzip
+  - mysql-server
+
+runcmd:
+  - mysql -u root --execute="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'; GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES; CREATE DATABASE traccar;"
+  - wget https://www.traccar.org/download/traccar-linux-64-latest.zip
+  - unzip traccar-linux-*.zip && ./traccar.run
+  - cp /root/traccar.xml /opt/traccar/conf/
+  - service traccar start
diff --git a/setup/default.xml b/setup/default.xml
index c00d29384..95bb1f04b 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -14,6 +14,7 @@
     <entry key='web.path'>./modern</entry>
     <entry key='web.sanitize'>false</entry>
     <entry key='web.persistSession'>false</entry>
+    <entry key='web.showUnknownDevices'>true</entry>
 
     <entry key='geocoder.enable'>true</entry>
     <entry key='geocoder.type'>locationiq</entry>
@@ -32,7 +33,7 @@
 
     <entry key='media.path'>./media</entry>
 
-    <entry key='notificator.types'>web,mail</entry>
+    <entry key='notificator.types'>web,mail,command</entry>
 
     <entry key='server.statistics'>https://www.traccar.org/analytics/</entry>
 
@@ -287,5 +288,15 @@
     <entry key='ndtpv6.port'>5243</entry>
     <entry key='g1rus.port'>5244</entry>
     <entry key='rftrack.port'>5245</entry>
+    <entry key='vlt.port'>5246</entry>
+    <entry key='transync.port'>5247</entry>
+    <entry key='t622iridium.port'>5248</entry>
+    <entry key='pui.port'>5249</entry>
+    <entry key='nto.port'>5250</entry>
+    <entry key='ramac.port'>5251</entry>
+    <entry key='positrex.port'>5252</entry>
+    <entry key='dragino.port'>5253</entry>
+    <entry key='fleetguide.port'>5254</entry>
+    <entry key='valtrack.port'>5255</entry>
 
 </properties>
diff --git a/setup/package.sh b/setup/package.sh
index 71b86014f..f8ec927eb 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -15,6 +15,7 @@ usage () {
   echo "Available platforms:"
   echo " * linux-64"
   echo " * linux-arm"
+  echo " * linux-arm64"
   echo " * windows-64"
   echo " * other"
   exit 1
@@ -64,15 +65,18 @@ if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
   check_requirement "Windows 64 Java" "ls OpenJDK*64_windows*.zip" "Missing Windows 64 JDK (https://adoptium.net/)"
   check_requirement "Wine" "which wine" "Missing wine binary"
 fi
-if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then
+if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" -o $PLATFORM = "linux-arm64" ]; then
   check_requirement "Makeself" "which makeself" "Missing makeself binary"
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" ]; then
-  check_requirement "Linux 64 Java" "ls OpenJDK*64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)"
+  check_requirement "Linux 64 Java" "ls OpenJDK*x64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)"
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then
   check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)"
 fi
+if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm64" ]; then
+  check_requirement "Linux ARM 64 Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM 64 JDK (https://adoptium.net/)"
+fi
 if [ $PREREQ = false ]; then
   info "Missing build requirements, aborting..."
   exit 1
@@ -120,7 +124,7 @@ package_other () {
 package_windows () {
   info "Building Windows 64 installer"
   unzip -q OpenJDK*64_windows*.zip
-  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
+  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec,jdk.unsupported --output out/jre
   rm -rf jdk-*
   wine app/ISCC.exe traccar.iss >/dev/null
   rm -rf out/jre
@@ -133,8 +137,8 @@ package_linux () {
   cp setup.sh out
   cp traccar.service out
 
-  tar -xf OpenJDK*$1_linux*.tar.gz
-  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
+  tar -xf OpenJDK*$2_linux*.tar.gz
+  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec,jdk.unsupported --output out/jre
   rm -rf jdk-*
   makeself --needroot --quiet --notemp out traccar.run "traccar" ./setup.sh
   rm -rf out/jre
@@ -148,22 +152,29 @@ package_linux () {
 
 package_linux_64 () {
   info "Building Linux 64 installer"
-  package_linux 64
+  package_linux 64 x64
   ok "Created Linux 64 installer"
 }
 
 package_linux_arm () {
   info "Building Linux ARM installer"
-  package_linux arm
+  package_linux arm arm
   ok "Created Linux ARM installer"
 }
 
+package_linux_arm64 () {
+  info "Building Linux ARM 64 installer"
+  package_linux arm64 aarch64
+  ok "Created Linux ARM 64 installer"
+}
+
 prepare
 
 case $PLATFORM in
   all)
 	package_linux_64
 	package_linux_arm
+	package_linux_arm64
 	package_windows
 	package_other
 	;;
@@ -176,6 +187,10 @@ case $PLATFORM in
 	package_linux_arm
 	;;
 
+  linux-arm64)
+	package_linux_arm64
+	;;
+
   windows-64)
 	package_windows
 	;;
diff --git a/setup/traccar.iss b/setup/traccar.iss
index 28b33adfb..2ccee1c3e 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=5.5
+AppVersion=5.12
 DefaultDirName={pf}\Traccar
 OutputBaseFilename=traccar-setup
 ArchitecturesInstallIn64BitMode=x64