Browse Source

Include nmap

Bob Mottram 10 years ago
parent
commit
8589771e63
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      install-freedombone.sh

+ 4
- 2
install-freedombone.sh View File

610
   if [[ $ENABLE_CJDNS != "yes" ]]; then
610
   if [[ $ENABLE_CJDNS != "yes" ]]; then
611
       return
611
       return
612
   fi
612
   fi
613
-  apt-get -y install nodejs git build-essential
613
+  apt-get -y install nodejs git build-essential nmap
614
 
614
 
615
   # if a README exists then obtain the cjdns parameters
615
   # if a README exists then obtain the cjdns parameters
616
   get_cjdns_ipv6_address
616
   get_cjdns_ipv6_address
827
   fi
827
   fi
828
 
828
 
829
   if ! grep -q "Mesh Networking" /home/$MY_USERNAME/README; then
829
   if ! grep -q "Mesh Networking" /home/$MY_USERNAME/README; then
830
+	  CURRENT_IP_ADDRESS=$(ip addr show | grep "inet " | sed -n 2p | awk -F ' ' '{print $2}' | awk -F '/' '{print $1}')
831
+
830
       echo '' >> /home/$MY_USERNAME/README
832
       echo '' >> /home/$MY_USERNAME/README
831
       echo '' >> /home/$MY_USERNAME/README
833
       echo '' >> /home/$MY_USERNAME/README
832
       echo 'Mesh Networking' >> /home/$MY_USERNAME/README
834
       echo 'Mesh Networking' >> /home/$MY_USERNAME/README
845
       echo 'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
847
       echo 'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
846
       echo 'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
848
       echo 'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
847
       echo '' >> /home/$MY_USERNAME/README
849
       echo '' >> /home/$MY_USERNAME/README
848
-      echo "\"your.external.ip.goes.here:$CJDNS_PORT\":{\"password\":\"$CJDNS_PASSWORD\",\"publicKey\":\"$CJDNS_PUBLIC_KEY\"}" >> /home/$MY_USERNAME/README
850
+      echo "\"$CURRENT_IP_ADDRESS:$CJDNS_PORT\":{\"password\":\"$CJDNS_PASSWORD\",\"publicKey\":\"$CJDNS_PUBLIC_KEY\"}" >> /home/$MY_USERNAME/README
849
       echo '' >> /home/$MY_USERNAME/README
851
       echo '' >> /home/$MY_USERNAME/README
850
       echo 'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
852
       echo 'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
851
       echo '' >> /home/$MY_USERNAME/README
853
       echo '' >> /home/$MY_USERNAME/README