浏览代码

Include nmap

Bob Mottram 10 年前
父节点
当前提交
8589771e63
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4
    2
      install-freedombone.sh

+ 4
- 2
install-freedombone.sh 查看文件

@@ -610,7 +610,7 @@ function install_cjdns {
610 610
   if [[ $ENABLE_CJDNS != "yes" ]]; then
611 611
       return
612 612
   fi
613
-  apt-get -y install nodejs git build-essential
613
+  apt-get -y install nodejs git build-essential nmap
614 614
 
615 615
   # if a README exists then obtain the cjdns parameters
616 616
   get_cjdns_ipv6_address
@@ -827,6 +827,8 @@ function install_cjdns {
827 827
   fi
828 828
 
829 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 832
       echo '' >> /home/$MY_USERNAME/README
831 833
       echo '' >> /home/$MY_USERNAME/README
832 834
       echo 'Mesh Networking' >> /home/$MY_USERNAME/README
@@ -845,7 +847,7 @@ function install_cjdns {
845 847
       echo 'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
846 848
       echo 'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
847 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 851
       echo '' >> /home/$MY_USERNAME/README
850 852
       echo 'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
851 853
       echo '' >> /home/$MY_USERNAME/README