aboutsummaryrefslogtreecommitdiff
path: root/setup/unix
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-18 00:26:16 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-09-18 00:26:16 +1200
commit20916b8c2017a8c89452fb49321d826f553df9c0 (patch)
tree90cd6e12e0cab8e16867ed0ee302fa9a9285ea8d /setup/unix
parentef234432c20772b1eaf7fccf6bab7fa536fb47db (diff)
downloadtraccar-server-20916b8c2017a8c89452fb49321d826f553df9c0.tar.gz
traccar-server-20916b8c2017a8c89452fb49321d826f553df9c0.tar.bz2
traccar-server-20916b8c2017a8c89452fb49321d826f553df9c0.zip
Move from JSW to YAJSW wrapper
Diffstat (limited to 'setup/unix')
-rwxr-xr-xsetup/unix/linux-arm-setup.sh22
-rwxr-xr-xsetup/unix/setup.sh19
-rw-r--r--setup/unix/traccar.xml6
3 files changed, 3 insertions, 44 deletions
diff --git a/setup/unix/linux-arm-setup.sh b/setup/unix/linux-arm-setup.sh
deleted file mode 100755
index 8128e9396..000000000
--- a/setup/unix/linux-arm-setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-UNIX_PATH="/opt/traccar"
-
-if [ $(java -version 2>&1 | grep -i version | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]
-then
- echo "Please install Java version 7 or higher"
-else
- mkdir -p $UNIX_PATH
- cp -rf * $UNIX_PATH
- chmod -R go+rX $UNIX_PATH
- if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ]
- then
- mv $UNIX_PATH/bin/wrapper-linux-armel-32 $UNIX_PATH/bin/wrapper
- mv $UNIX_PATH/lib/libwrapper-linux-armel-32.so $UNIX_PATH/lib/libwrapper.so
- else
- mv $UNIX_PATH/bin/wrapper-linux-armhf-32 $UNIX_PATH/bin/wrapper
- mv $UNIX_PATH/lib/libwrapper-linux-armhf-32.so $UNIX_PATH/lib/libwrapper.so
- fi
- $UNIX_PATH/bin/traccar install
- rm $UNIX_PATH/setup.sh
-fi
diff --git a/setup/unix/setup.sh b/setup/unix/setup.sh
deleted file mode 100755
index 478966ea0..000000000
--- a/setup/unix/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-UNIX_PATH="/opt/traccar"
-
-if which java &>/dev/null
-then
- if [ $(java -version 2>&1 | grep -i version | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') -lt 17 ]
- then
- echo "Java 7 or higher required"
- else
- mkdir -p $UNIX_PATH
- cp -rf * $UNIX_PATH
- chmod -R go+rX $UNIX_PATH
- $UNIX_PATH/bin/traccar install
- rm $UNIX_PATH/setup.sh
- fi
-else
- echo "Java runtime is required"
-fi
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 50847dcdf..a7ead50e5 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -15,7 +15,7 @@
<entry key='logger.enable'>true</entry>
<entry key='logger.level'>all</entry>
- <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
+ <entry key='logger.file'>./logs/tracker-server.log</entry>
<entry key='event.enable'>true</entry>
<entry key='event.overspeedHandler'>true</entry>
@@ -28,13 +28,13 @@
<!-- DATABASE CONFIG -->
<entry key='database.driver'>org.h2.Driver</entry>
- <entry key='database.url'>jdbc:h2:/opt/traccar/data/database</entry>
+ <entry key='database.url'>jdbc:h2:./data/database</entry>
<entry key='database.user'>sa</entry>
<entry key='database.password'></entry>
<entry key='database.ignoreUnknown'>true</entry>
- <entry key='database.changelog'>/opt/traccar/schema/changelog-master.xml</entry>
+ <entry key='database.changelog'>./schema/changelog-master.xml</entry>
<entry key='database.selectServers'>
SELECT * FROM server;