From e20db832cb9a362524ea5204b0b03e4e1bc7e4c6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 24 Apr 2013 20:59:09 +1200 Subject: Use same name for config files --- setup/linux/linux.cfg | 211 ---------------------------------------------- setup/linux/traccar.cfg | 211 ++++++++++++++++++++++++++++++++++++++++++++++ setup/macosx/macosx.cfg | 211 ---------------------------------------------- setup/macosx/traccar.cfg | 211 ++++++++++++++++++++++++++++++++++++++++++++++ setup/package.sh | 8 +- setup/windows/traccar.cfg | 187 ++++++++++++++++++++++++++++++++++++++++ setup/windows/traccar.iss | 4 +- setup/windows/windows.cfg | 187 ---------------------------------------- 8 files changed, 614 insertions(+), 616 deletions(-) delete mode 100644 setup/linux/linux.cfg create mode 100644 setup/linux/traccar.cfg delete mode 100644 setup/macosx/macosx.cfg create mode 100644 setup/macosx/traccar.cfg create mode 100644 setup/windows/traccar.cfg delete mode 100644 setup/windows/windows.cfg (limited to 'setup') diff --git a/setup/linux/linux.cfg b/setup/linux/linux.cfg deleted file mode 100644 index 00831c08e..000000000 --- a/setup/linux/linux.cfg +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - org.h2.Driver - org.h2.jdbcx.JdbcDataSource - jdbc:h2:/opt/traccar/data/database - sa - - - - 300 - - - id - Long - imei - String - <--> - - SELECT id, uniqueId as imei - FROM devices; - - - - device_id - Long - time - Date - valid - Boolean - latitude - Double - longitude - Double - speed - Double - course - Double - power - Double (NULL for some protocols) - extended_info - String (XML) - <--> - - INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) - VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); - - - - device_id - Long - id - Long - <--> - - UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; - - - - true - 8082 - /opt/traccar/traccar-web.war - - - true - /opt/traccar/logs/tracker-server.log - - - true - 5000 - - - true - 5001 - - - true - 5002 - - - true - 5003 - - - true - 5004 - - - true - 5005 - - - true - 5006 - - - true - 5007 - - - true - 5008 - - - true - 5009 - - - true - 5010 - - - true - 5011 - - - true - 5012 - - - true - 5013 - - - true - 5014 - - - true - 5015 - - - true - 5016 - - - true - 5017 - - - true - 5018 - - - true - 5019 - - - true - 5020 - - - true - 5021 - - - true - 5022 - - - true - 5023 - - - true - 5018 - - - true - 5019 - - - true - 5020 - - - true - 5021 - - - true - 5022 - - - true - 5023 - - - true - 5024 - - - true - 5025 - - - true - 5026 - - - true - 5027 - - - true - 5028 - - - true - 5029 - - - true - 5030 - - - true - 5031 - - diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg new file mode 100644 index 000000000..00831c08e --- /dev/null +++ b/setup/linux/traccar.cfg @@ -0,0 +1,211 @@ + + + + + + + + org.h2.Driver + org.h2.jdbcx.JdbcDataSource + jdbc:h2:/opt/traccar/data/database + sa + + + + 300 + + + id - Long + imei - String + <--> + + SELECT id, uniqueId as imei + FROM devices; + + + + device_id - Long + time - Date + valid - Boolean + latitude - Double + longitude - Double + speed - Double + course - Double + power - Double (NULL for some protocols) + extended_info - String (XML) + <--> + + INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) + VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); + + + + device_id - Long + id - Long + <--> + + UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; + + + + true + 8082 + /opt/traccar/traccar-web.war + + + true + /opt/traccar/logs/tracker-server.log + + + true + 5000 + + + true + 5001 + + + true + 5002 + + + true + 5003 + + + true + 5004 + + + true + 5005 + + + true + 5006 + + + true + 5007 + + + true + 5008 + + + true + 5009 + + + true + 5010 + + + true + 5011 + + + true + 5012 + + + true + 5013 + + + true + 5014 + + + true + 5015 + + + true + 5016 + + + true + 5017 + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + + + true + 5024 + + + true + 5025 + + + true + 5026 + + + true + 5027 + + + true + 5028 + + + true + 5029 + + + true + 5030 + + + true + 5031 + + diff --git a/setup/macosx/macosx.cfg b/setup/macosx/macosx.cfg deleted file mode 100644 index 00831c08e..000000000 --- a/setup/macosx/macosx.cfg +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - org.h2.Driver - org.h2.jdbcx.JdbcDataSource - jdbc:h2:/opt/traccar/data/database - sa - - - - 300 - - - id - Long - imei - String - <--> - - SELECT id, uniqueId as imei - FROM devices; - - - - device_id - Long - time - Date - valid - Boolean - latitude - Double - longitude - Double - speed - Double - course - Double - power - Double (NULL for some protocols) - extended_info - String (XML) - <--> - - INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) - VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); - - - - device_id - Long - id - Long - <--> - - UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; - - - - true - 8082 - /opt/traccar/traccar-web.war - - - true - /opt/traccar/logs/tracker-server.log - - - true - 5000 - - - true - 5001 - - - true - 5002 - - - true - 5003 - - - true - 5004 - - - true - 5005 - - - true - 5006 - - - true - 5007 - - - true - 5008 - - - true - 5009 - - - true - 5010 - - - true - 5011 - - - true - 5012 - - - true - 5013 - - - true - 5014 - - - true - 5015 - - - true - 5016 - - - true - 5017 - - - true - 5018 - - - true - 5019 - - - true - 5020 - - - true - 5021 - - - true - 5022 - - - true - 5023 - - - true - 5018 - - - true - 5019 - - - true - 5020 - - - true - 5021 - - - true - 5022 - - - true - 5023 - - - true - 5024 - - - true - 5025 - - - true - 5026 - - - true - 5027 - - - true - 5028 - - - true - 5029 - - - true - 5030 - - - true - 5031 - - diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg new file mode 100644 index 000000000..00831c08e --- /dev/null +++ b/setup/macosx/traccar.cfg @@ -0,0 +1,211 @@ + + + + + + + + org.h2.Driver + org.h2.jdbcx.JdbcDataSource + jdbc:h2:/opt/traccar/data/database + sa + + + + 300 + + + id - Long + imei - String + <--> + + SELECT id, uniqueId as imei + FROM devices; + + + + device_id - Long + time - Date + valid - Boolean + latitude - Double + longitude - Double + speed - Double + course - Double + power - Double (NULL for some protocols) + extended_info - String (XML) + <--> + + INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) + VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); + + + + device_id - Long + id - Long + <--> + + UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; + + + + true + 8082 + /opt/traccar/traccar-web.war + + + true + /opt/traccar/logs/tracker-server.log + + + true + 5000 + + + true + 5001 + + + true + 5002 + + + true + 5003 + + + true + 5004 + + + true + 5005 + + + true + 5006 + + + true + 5007 + + + true + 5008 + + + true + 5009 + + + true + 5010 + + + true + 5011 + + + true + 5012 + + + true + 5013 + + + true + 5014 + + + true + 5015 + + + true + 5016 + + + true + 5017 + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + + + true + 5024 + + + true + 5025 + + + true + 5026 + + + true + 5027 + + + true + 5028 + + + true + 5029 + + + true + 5030 + + + true + 5031 + + diff --git a/setup/package.sh b/setup/package.sh index c3c67b7a8..a2a7e916c 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -96,13 +96,13 @@ cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf cp ../target/tracker-server.jar out cp ../target/lib/* out/lib cp traccar-web.war out -cp linux/linux.cfg out/conf +cp linux/traccar.cfg out/conf sed -i 's/@app.name@/traccar/g' out/bin/traccar sed -i 's/@app.long.name@/traccar/g' out/bin/traccar sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf -sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/linux.cfg" out/conf/wrapper.conf +sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/traccar.cfg" out/conf/wrapper.conf sed -i 's//org.traccar.Main/g' out/conf/wrapper.conf sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf @@ -142,9 +142,7 @@ zip -j traccar-linux-arm.zip traccar.run linux/README.txt rm out/conf/linux.cfg rm out/lib/libwrapper.so -cp macosx/macosx.cfg out/conf - -sed -i "s/linux.cfg/macosx.cfg/g" out/conf/wrapper.conf +cp macosx/traccar.cfg out/conf cp wrapper/bin/wrapper-macosx-universal-64 out/bin/wrapper cp wrapper/lib/libwrapper-macosx-universal-64.jnilib out/lib/libwrapper.jnilib diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg new file mode 100644 index 000000000..d8cacc1df --- /dev/null +++ b/setup/windows/traccar.cfg @@ -0,0 +1,187 @@ + + + + + + + + org.h2.Driver + org.h2.jdbcx.JdbcDataSource + jdbc:h2:[DATABASE] + sa + + + + 300 + + + id - Long + imei - String + <--> + + SELECT id, uniqueId as imei + FROM devices; + + + + device_id - Long + time - Date + valid - Boolean + latitude - Double + longitude - Double + speed - Double + course - Double + power - Double (NULL for some protocols) + extended_info - String (XML) + <--> + + INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) + VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); + + + + device_id - Long + id - Long + <--> + + UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; + + + + true + 8082 + [WAR] + + + true + [LOG] + + + true + 5000 + + + true + 5001 + + + true + 5002 + + + true + 5003 + + + true + 5004 + + + true + 5005 + + + true + 5006 + + + true + 5007 + + + true + 5008 + + + true + 5009 + + + true + 5010 + + + true + 5011 + + + true + 5012 + + + true + 5013 + + + true + 5014 + + + true + 5015 + + + true + 5016 + + + true + 5017 + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + + + true + 5024 + + + true + 5025 + + + true + 5026 + + + true + 5027 + + + true + 5028 + + + true + 5029 + + + true + 5030 + + + true + 5031 + + diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss index 50e30ba26..a8ceef253 100644 --- a/setup/windows/traccar.iss +++ b/setup/windows/traccar.iss @@ -23,7 +23,7 @@ Source: "..\wrapper\src\conf\wrapper.conf.in"; DestDir: "{app}\conf"; DestName: Source: "..\..\target\tracker-server.jar"; DestDir: "{app}" Source: "..\..\target\lib\*"; DestDir: "{app}\lib" Source: "..\traccar-web.war"; DestDir: "{app}" -Source: "windows.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication +Source: "traccar.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication [Run] Filename: "{app}\bin\InstallTraccar-NT.bat" @@ -51,7 +51,7 @@ var begin LoadStringFromFile(ExpandConstant(CurrentFileName), S); Insert('wrapper.java.classpath.2=../tracker-server.jar' + #13#10, S, Pos('wrapper.java.classpath.1', S)); - Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\windows.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S)); + Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\traccar.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S)); StringChangeEx(S, '', 'org.traccar.Main', true); StringChangeEx(S, '@app.name@', 'Traccar', true); StringChangeEx(S, '@app.long.name@', 'Traccar', true); diff --git a/setup/windows/windows.cfg b/setup/windows/windows.cfg deleted file mode 100644 index d8cacc1df..000000000 --- a/setup/windows/windows.cfg +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - org.h2.Driver - org.h2.jdbcx.JdbcDataSource - jdbc:h2:[DATABASE] - sa - - - - 300 - - - id - Long - imei - String - <--> - - SELECT id, uniqueId as imei - FROM devices; - - - - device_id - Long - time - Date - valid - Boolean - latitude - Double - longitude - Double - speed - Double - course - Double - power - Double (NULL for some protocols) - extended_info - String (XML) - <--> - - INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) - VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); - - - - device_id - Long - id - Long - <--> - - UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; - - - - true - 8082 - [WAR] - - - true - [LOG] - - - true - 5000 - - - true - 5001 - - - true - 5002 - - - true - 5003 - - - true - 5004 - - - true - 5005 - - - true - 5006 - - - true - 5007 - - - true - 5008 - - - true - 5009 - - - true - 5010 - - - true - 5011 - - - true - 5012 - - - true - 5013 - - - true - 5014 - - - true - 5015 - - - true - 5016 - - - true - 5017 - - - true - 5018 - - - true - 5019 - - - true - 5020 - - - true - 5021 - - - true - 5022 - - - true - 5023 - - - true - 5024 - - - true - 5025 - - - true - 5026 - - - true - 5027 - - - true - 5028 - - - true - 5029 - - - true - 5030 - - - true - 5031 - - -- cgit v1.2.3