diff options
| author | Iván Ávalos <avalos@disroot.org> | 2021-12-27 20:48:47 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2021-12-27 20:48:47 -0600 |
| commit | aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f (patch) | |
| tree | e74474e6b6bd75a71ac79bdbd31b9237a7b3c2d6 /setup | |
| parent | f03b999d6d17e53c1c1e1aa2f9271d03f12f2264 (diff) | |
| download | traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.tar.gz traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.tar.bz2 traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.zip | |
Revert "Merge branch 'master' into suntech-fixes"
This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing
changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef.
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 18 | ||||
| -rwxr-xr-x | setup/package.sh | 1 |
2 files changed, 3 insertions, 16 deletions
diff --git a/setup/default.xml b/setup/default.xml index a592bbbed..20bf515d2 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -12,12 +12,9 @@ <entry key='web.port'>8082</entry> <entry key='web.path'>./web</entry> - <entry key='web.persistSession'>false</entry> - <entry key='geocoder.enable'>true</entry> - <entry key='geocoder.type'>nominatim</entry> - <entry key='geocoder.url'>https://us1.locationiq.com/v1/reverse.php</entry> - <entry key='geocoder.key'>pk.689d849289c8c63708068b2ff1f63b2d</entry> + <entry key='geocoder.enable'>false</entry> + <entry key='geocoder.type'>google</entry> <entry key='logger.level'>info</entry> <entry key='logger.file'>./logs/tracker-server.log</entry> @@ -51,10 +48,6 @@ SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime </entry> - <entry key='database.selectPrecedingPosition'> - SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime <= :time ORDER BY fixTime DESC LIMIT 1 - </entry> - <entry key='database.selectLatestPositions'> SELECT tc_positions.* FROM tc_positions INNER JOIN tc_devices ON tc_positions.id = tc_devices.positionid; </entry> @@ -301,12 +294,5 @@ <entry key='flexiblereport.port'>5227</entry> <entry key='thinkpower.port'>5228</entry> <entry key='stb.port'>5229</entry> - <entry key='b2316.port'>5230</entry> - <entry key='hoopo.port'>5231</entry> - <entry key='dualcam.port'>5232</entry> - <entry key='xexun2.port'>5233</entry> - <entry key='techtocruz.port'>5234</entry> - <entry key='flexapi.port'>5235</entry> - <entry key='dsf22.port'>5236</entry> </properties> diff --git a/setup/package.sh b/setup/package.sh index e5f976b79..bb890fbd0 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -39,6 +39,7 @@ warn () { VERSION=$1 PLATFORM=${2:-all} +export EXTJS_PATH=$(cd ../..; pwd)/ext-6.2.0 PREREQ=true check_requirement () { |