Bläddra i källkod

Mount message

Bob Mottram 11 år sedan
förälder
incheckning
1504a2f252
1 ändrade filer med 20 tillägg och 19 borttagningar
  1. 20
    19
      install-freedombone.sh

+ 20
- 19
install-freedombone.sh Visa fil

152
   fi
152
   fi
153
   if [ -d $USB_DRIVE ]; then
153
   if [ -d $USB_DRIVE ]; then
154
       if [ ! -d /media/usb ]; then
154
       if [ ! -d /media/usb ]; then
155
+          echo 'Mounting USB drive'
155
           mount $USB_DRIVE /media/usb
156
           mount $USB_DRIVE /media/usb
156
       fi
157
       fi
157
       if [ -d /media/usb/Maildir ]; then
158
       if [ -d /media/usb/Maildir ]; then
271
       return
272
       return
272
   fi
273
   fi
273
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
274
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
274
-	  return
275
+      return
275
   fi
276
   fi
276
   cd /opt/scripts/tools
277
   cd /opt/scripts/tools
277
   ./update_kernel.sh --kernel $KERNEL_VERSION
278
   ./update_kernel.sh --kernel $KERNEL_VERSION
283
       return
284
       return
284
   fi
285
   fi
285
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
286
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
286
-	  return
287
+      return
287
   fi
288
   fi
288
   if ! grep -q "options zram num_devices=1" /etc/modprobe.d/zram.conf; then
289
   if ! grep -q "options zram num_devices=1" /etc/modprobe.d/zram.conf; then
289
       echo 'options zram num_devices=1' >> /etc/modprobe.d/zram.conf
290
       echo 'options zram num_devices=1' >> /etc/modprobe.d/zram.conf
365
       return
366
       return
366
   fi
367
   fi
367
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
368
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
368
-	  # it is assumed that docker uses the random number
369
-	  # generator of the host system
370
-	  return
369
+      # it is assumed that docker uses the random number
370
+      # generator of the host system
371
+      return
371
   fi
372
   fi
372
   if [ $USE_HWRNG == "yes" ]; then
373
   if [ $USE_HWRNG == "yes" ]; then
373
     apt-get -y --force-yes install rng-tools
374
     apt-get -y --force-yes install rng-tools
557
       return
558
       return
558
   fi
559
   fi
559
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
560
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
560
-	  # docker does its own firewalling
561
-	  return
561
+      # docker does its own firewalling
562
+      return
562
   fi
563
   fi
563
   iptables -P INPUT ACCEPT
564
   iptables -P INPUT ACCEPT
564
   ip6tables -P INPUT ACCEPT
565
   ip6tables -P INPUT ACCEPT
587
       return
588
       return
588
   fi
589
   fi
589
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
590
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
590
-	  # docker does its own firewalling
591
-	  return
591
+      # docker does its own firewalling
592
+      return
592
   fi
593
   fi
593
   iptables -A INPUT -i eth0 -p udp -m udp --dport 1024:65535 --sport 53 -j ACCEPT
594
   iptables -A INPUT -i eth0 -p udp -m udp --dport 1024:65535 --sport 53 -j ACCEPT
594
   save_firewall_settings
595
   save_firewall_settings
600
       return
601
       return
601
   fi
602
   fi
602
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
603
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
603
-	  # docker does its own firewalling
604
-	  return
604
+      # docker does its own firewalling
605
+      return
605
   fi
606
   fi
606
   iptables -I INPUT -i eth0 -p tcp --dport 1024:65535 --sport 20:21 -j ACCEPT
607
   iptables -I INPUT -i eth0 -p tcp --dport 1024:65535 --sport 20:21 -j ACCEPT
607
   save_firewall_settings
608
   save_firewall_settings
613
       return
614
       return
614
   fi
615
   fi
615
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
616
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
616
-	  # docker does its own firewalling
617
-	  return
617
+      # docker does its own firewalling
618
+      return
618
   fi
619
   fi
619
   iptables -A INPUT -i eth0 -p tcp --dport 32768:61000 --sport 80 -j ACCEPT
620
   iptables -A INPUT -i eth0 -p tcp --dport 32768:61000 --sport 80 -j ACCEPT
620
   iptables -A INPUT -i eth0 -p tcp --dport 32768:61000 --sport 443 -j ACCEPT
621
   iptables -A INPUT -i eth0 -p tcp --dport 32768:61000 --sport 443 -j ACCEPT
627
       return
628
       return
628
   fi
629
   fi
629
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
630
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
630
-	  # docker does its own firewalling
631
-	  return
631
+      # docker does its own firewalling
632
+      return
632
   fi
633
   fi
633
   iptables -A INPUT -i eth0 -p tcp --dport 22 -j ACCEPT
634
   iptables -A INPUT -i eth0 -p tcp --dport 22 -j ACCEPT
634
   iptables -A INPUT -i eth0 -p tcp --dport $SSH_PORT -j ACCEPT
635
   iptables -A INPUT -i eth0 -p tcp --dport $SSH_PORT -j ACCEPT
641
       return
642
       return
642
   fi
643
   fi
643
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
644
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
644
-	  # docker does its own firewalling
645
-	  return
645
+      # docker does its own firewalling
646
+      return
646
   fi
647
   fi
647
   iptables -A INPUT -i eth0 -p tcp --dport 9418 -j ACCEPT
648
   iptables -A INPUT -i eth0 -p tcp --dport 9418 -j ACCEPT
648
   save_firewall_settings
649
   save_firewall_settings
654
       return
655
       return
655
   fi
656
   fi
656
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
657
   if [ $INSTALLED_WITHIN_DOCKER == "yes" ]; then
657
-	  # docker does its own firewalling
658
-	  return
658
+      # docker does its own firewalling
659
+      return
659
   fi
660
   fi
660
   iptables -A INPUT -i eth0 -p tcp --dport 25 -j ACCEPT
661
   iptables -A INPUT -i eth0 -p tcp --dport 25 -j ACCEPT
661
   iptables -A INPUT -i eth0 -p tcp --dport 587 -j ACCEPT
662
   iptables -A INPUT -i eth0 -p tcp --dport 587 -j ACCEPT