Преглед на файлове

Launch tracker on client

Bob Mottram преди 9 години
родител
ревизия
41a4c937f9
променени са 2 файла, в които са добавени 17 реда и са изтрити 2 реда
  1. 1
    1
      src/freedombone
  2. 16
    1
      src/freedombone-mesh

+ 1
- 1
src/freedombone Целия файл

@@ -1659,7 +1659,7 @@ function install_zeronet {
1659 1659
   echo 'User=tracker' >> /etc/systemd/system/tracker.service
1660 1660
   echo 'Group=tracker' >> /etc/systemd/system/tracker.service
1661 1661
   echo 'WorkingDirectory=/opt/tracker' >> /etc/systemd/system/tracker.service
1662
-  echo 'ExecStart=bttrack --port 6969 --dfile /opt/tracker/dstate --logfile /opt/tracker/tracker.log --nat_check 0 --scrape_allowed full' >> /etc/systemd/system/tracker.service
1662
+  echo "ExecStart=bttrack --port $TRACKER_PORT --dfile /opt/tracker/dstate --logfile /opt/tracker/tracker.log --nat_check 0 --scrape_allowed full" >> /etc/systemd/system/tracker.service
1663 1663
   echo '' >> /etc/systemd/system/tracker.service
1664 1664
   echo 'TimeoutSec=300' >> /etc/systemd/system/tracker.service
1665 1665
   echo '' >> /etc/systemd/system/tracker.service

+ 16
- 1
src/freedombone-mesh Целия файл

@@ -380,8 +380,23 @@ fi
380 380
 
381 381
 if [[ $peer_index == 1 ]]; then
382 382
     cd $ZERONET_DIR
383
+
384
+    if [ ! -d ~/.bttrack ]; then
385
+        mkdir ~/.bttrack
386
+    fi
387
+
388
+    existing_bttrack=$(ps aux | grep bttrack | wc -l)
389
+    if [ $existing_bttrack -lt "2" ]; then
390
+        bttrack --port $TRACKER_PORT --dfile ~/.bttrack/dstate --logfile ~/.bttrack/tracker.log --nat_check 0 --scrape_allowed full &
391
+    fi
392
+
383 393
     zeronetavahi
384
-    python zeronet.py &
394
+
395
+    existing_zeronet=$(ps aux | grep zeronet | wc -l)
396
+    if [ $existing_zeronet -lt "2" ]; then
397
+        python zeronet.py &
398
+    fi
399
+
385 400
     if which xdg-open > /dev/null; then
386 401
         xdg-open $ZERONET_URL
387 402
     elif which gnome-open > /dev/null; then