Kaynağa Gözat

Install a web server on mesh clients for the zeronet tracker

Bob Mottram 9 yıl önce
ebeveyn
işleme
87d5c2ac57
2 değiştirilmiş dosya ile 24 ekleme ve 4 silme
  1. 2
    1
      src/freedombone
  2. 22
    3
      src/freedombone-meshweb

+ 2
- 1
src/freedombone Dosyayı Görüntüle

@@ -6043,6 +6043,7 @@ function configure_firewall_for_zeronet {
6043 6043
   iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT
6044 6044
   iptables -A INPUT -i $WIFI_INTERFACE -p tcp --dport $ZERONET_PORT -j ACCEPT
6045 6045
   iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $TRACKER_PORT -j ACCEPT
6046
+  iptables -A INPUT -i $WIFI_INTERFACE -p tcp --dport $TRACKER_PORT -j ACCEPT
6046 6047
   iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport 1900 -j ACCEPT
6047 6048
   save_firewall_settings
6048 6049
   echo 'configure_firewall_for_zeronet' >> $COMPLETION_FILE
@@ -7391,7 +7392,7 @@ function import_email {
7391 7392
 }
7392 7393
 
7393 7394
 function install_web_server {
7394
-  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7395
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
7395 7396
       return
7396 7397
   fi
7397 7398
   if grep -Fxq "install_web_server" $COMPLETION_FILE; then

+ 22
- 3
src/freedombone-meshweb Dosyayı Görüntüle

@@ -13,6 +13,24 @@ ZERONET_DIR=~/zeronet
13 13
 ZERONET_URL=http://127.0.0.1:43110
14 14
 TRACKER_PORT=6969
15 15
 
16
+function install_web_server {
17
+    if [ -d /etc/nginx ]; then
18
+        return
19
+    fi
20
+
21
+    sudo apt-get -y remove --purge apache2
22
+    if [ -d /etc/apache2 ]; then
23
+        sudo rm -rf /etc/apache2
24
+    fi
25
+    # install nginx
26
+    sudo apt-get -y install nginx
27
+
28
+    if [ ! -d /etc/nginx ]; then
29
+        echo 'Unable to install web server'
30
+        exit 51
31
+    fi
32
+}
33
+
16 34
 function install_zeronet {
17 35
   if [ -d $ZERONET_DIR ]; then
18 36
       return
@@ -42,6 +60,7 @@ fi
42 60
 
43 61
 if [[ $SERVER_INSTALLATION == "no" ]]; then
44 62
     if [ ! -f /tmp/meshtype ]; then
63
+        install_web_server
45 64
         install_zeronet
46 65
         sudo batman start
47 66
         if [ ! "$?" = "0" ]; then
@@ -78,9 +97,9 @@ cd $ZERONET_DIR
78 97
 
79 98
 existing_bttrack=$(ps aux | grep bttrack | wc -l)
80 99
 if [ $existing_bttrack -lt "2" ]; then
81
-	if [ ! -d ~/.bttrack ]; then
82
-		mkdir ~/.bttrack
83
-	fi
100
+    if [ ! -d ~/.bttrack ]; then
101
+        mkdir ~/.bttrack
102
+    fi
84 103
     bttrack --port ${TRACKER_PORT} --dfile ~/.bttrack/dstate --logfile ~/.bttrack/tracker.log --nat_check 0 --scrape_allowed full --ipv6_enabled 0 &
85 104
 fi
86 105