소스 검색

Don't install ssh server on mesh images

Bob Mottram 8 년 전
부모
커밋
7571380f51
2개의 변경된 파일4개의 추가작업 그리고 13개의 파일을 삭제
  1. 4
    1
      src/freedombone-image-customise
  2. 0
    12
      src/freedombone-image-mesh

+ 4
- 1
src/freedombone-image-customise 파일 보기

@@ -843,7 +843,10 @@ if [ -n "$CUSTOM_SETUP" ]; then
843 843
     chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)"
844 844
 fi
845 845
 
846
-chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential openssh-server
846
+if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "mesh" ]]; then
847
+    chroot "$rootdir" apt-get install -y openssh-server
848
+fi
849
+chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential
847 850
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
848 851
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
849 852
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp

+ 0
- 12
src/freedombone-image-mesh 파일 보기

@@ -113,17 +113,6 @@ function change_avahi_name {
113 113
     echo $"avahi name changed to P${PEER_ID}.local" >> $INSTALL_LOG
114 114
 }
115 115
 
116
-function regenerate_ssh_host_keys {
117
-    echo $"Regenerating ssh host keys" >> $INSTALL_LOG
118
-    rm -f /etc/ssh/ssh_host_*
119
-    dpkg-reconfigure openssh-server
120
-    echo $'ssh host keys regenerated' >> $INSTALL_LOG
121
-    # remove small moduli
122
-    awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
123
-    mv ~/moduli /etc/ssh/moduli
124
-    echo $'ssh small moduli removed' >> $INSTALL_LOG
125
-}
126
-
127 116
 function configure_zeronet {
128 117
     sed -i "s|ExecStart=.*|ExecStart=/usr/bin/python zeronet.py --ip_external P${PEER_ID}.local --trackers_file $MESH_INSTALL_DIR/zeronet/bootstrap|g" /etc/systemd/system/zeronet.service
129 118
     echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
@@ -805,7 +794,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
805 794
     create_ram_disk 1
806 795
     setup_amnesic_data
807 796
     change_avahi_name
808
-    regenerate_ssh_host_keys
809 797
     if [ $ENABLE_ZERONET ]; then
810 798
         configure_zeronet_blog
811 799
         configure_zeronet_mail