diff options
| -rw-r--r-- | debug.xml | 2 | ||||
| -rw-r--r-- | schema/changelog-3.3.xml (renamed from database/changelog-3.3.xml) | 0 | ||||
| -rw-r--r-- | schema/changelog-3.5.xml (renamed from database/changelog-3.5.xml) | 0 | ||||
| -rw-r--r-- | schema/changelog-3.6.xml (renamed from database/changelog-3.6.xml) | 0 | ||||
| -rw-r--r-- | schema/changelog-master.xml (renamed from database/changelog-master.xml) | 0 | ||||
| -rw-r--r-- | setup/README.txt | 1 | ||||
| -rwxr-xr-x | setup/package.sh | 8 | ||||
| -rw-r--r-- | setup/unix/traccar.xml | 2 | ||||
| -rw-r--r-- | setup/windows/traccar.iss | 2 |
9 files changed, 8 insertions, 7 deletions
@@ -52,7 +52,7 @@ <entry key='database.xml'>false</entry> <entry key='database.saveOriginal'>false</entry> - <entry key='database.changelog'>./database/changelog-master.xml</entry> + <entry key='database.changelog'>./schema/changelog-master.xml</entry> <entry key='database.selectServers'> SELECT * FROM server; diff --git a/database/changelog-3.3.xml b/schema/changelog-3.3.xml index 1893a0200..1893a0200 100644 --- a/database/changelog-3.3.xml +++ b/schema/changelog-3.3.xml diff --git a/database/changelog-3.5.xml b/schema/changelog-3.5.xml index 63a3a3a92..63a3a3a92 100644 --- a/database/changelog-3.5.xml +++ b/schema/changelog-3.5.xml diff --git a/database/changelog-3.6.xml b/schema/changelog-3.6.xml index 378ec741f..378ec741f 100644 --- a/database/changelog-3.6.xml +++ b/schema/changelog-3.6.xml diff --git a/database/changelog-master.xml b/schema/changelog-master.xml index 399cd3c8d..399cd3c8d 100644 --- a/database/changelog-master.xml +++ b/schema/changelog-master.xml diff --git a/setup/README.txt b/setup/README.txt index 071cb1d8c..c50b392e2 100644 --- a/setup/README.txt +++ b/setup/README.txt @@ -4,6 +4,7 @@ Installation instructions are available on the official website: Windows - https://www.traccar.org/windows/
Linux - https://www.traccar.org/linux/
+Docker - https://www.traccar.org/docker/
OS X - https://www.traccar.org/mac-os/
OpenBSD - https://www.traccar.org/openbsd/
FreeBSD - https://www.traccar.org/freebsd/
diff --git a/setup/package.sh b/setup/package.sh index 0fe0fd5a9..a7b58b599 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -102,7 +102,7 @@ package_windows () { package_unix () { - mkdir -p out/{bin,conf,data,lib,logs,web} + mkdir -p out/{bin,conf,data,lib,logs,web,schema} cp wrapper/src/bin/sh.script.in out/bin/traccar cp wrapper/lib/wrapper.jar out/lib @@ -113,7 +113,7 @@ package_unix () { cp ../target/tracker-server.jar out cp ../target/lib/* out/lib - cp ../database/* out/data +cp ../schema/* out/schema cp -r ../web/* out/web cp unix/traccar.xml out/conf @@ -140,11 +140,11 @@ package_unix () { package_universal () { - mkdir -p out/{conf,data,lib,logs,web} + mkdir -p out/{conf,data,lib,logs,web,schema} cp ../target/tracker-server.jar out cp ../target/lib/* out/lib - cp ../database/* out/data + cp ../schema/* out/schema cp -r ../web/* out/web cp windows/traccar.xml out/conf cp README.txt out diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index 03ba845fc..d8d4a1084 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -31,7 +31,7 @@ <entry key='database.user'>sa</entry> <entry key='database.password'></entry> - <entry key='database.changelog'>/opt/traccar/data/changelog-master.xml</entry> + <entry key='database.changelog'>/opt/traccar/schema/changelog-master.xml</entry> <entry key='database.selectServers'> SELECT * FROM server; diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss index 33d8f6837..56de5c1a6 100644 --- a/setup/windows/traccar.iss +++ b/setup/windows/traccar.iss @@ -83,6 +83,6 @@ begin StringChangeEx(S, '[WEB]', ExpandConstant('{app}\web'), true);
StringChangeEx(S, '[LOG]', ExpandConstant('{app}\logs\tracker-server.log'), true);
StringChangeEx(S, '[DATABASE]', ExpandConstant('{app}\data\database'), true);
- StringChangeEx(S, '[CHANGELOG]', ExpandConstant('{app}\data\changelog-master.xml'), true);
+ StringChangeEx(S, '[CHANGELOG]', ExpandConstant('{app}\schema\changelog-master.xml'), true);
SaveStringToFile(ExpandConstant(CurrentFileName), S, false);
end;
|