Bob Mottram před 9 roky
rodič
revize
ca102a3820
1 změnil soubory, kde provedl 1 přidání a 8 odebrání
  1. 1
    8
      src/freedombone

+ 1
- 8
src/freedombone Zobrazit soubor

@@ -4796,13 +4796,6 @@ function random_number_generator {
4796 4796
   if grep -Fxq "random_number_generator" $COMPLETION_FILE; then
4797 4797
       return
4798 4798
   fi
4799
-  if [[ $INSTALLING_ON_BBB != "yes" ]]; then
4800
-      # On systems which are not beaglebones assume that
4801
-      # no hardware random number generator is available
4802
-      # and use the second best option
4803
-      apt-get -y install haveged
4804
-      return
4805
-  fi
4806 4799
   if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
4807 4800
       # it is assumed that docker uses the random number
4808 4801
       # generator of the host system
@@ -5661,7 +5654,7 @@ function configure_imap {
5661 5654
   #sed -i 's|#ssl_ca =.*|ssl_ca = /etc/ssl/certs/dovecot-ca.pem|g' /etc/dovecot/conf.d/10-ssl.conf
5662 5655
   #sed -i 's|#ssl_cert_username_field =.*|ssl_cert_username_field = commonName|g' /etc/dovecot/conf.d/10-ssl.conf
5663 5656
   #if ! grep -q "passdb {" /etc/dovecot/conf.d/10-auth.conf; then
5664
-	#echo '' >> /etc/dovecot/conf.d/10-auth.conf
5657
+    #echo '' >> /etc/dovecot/conf.d/10-auth.conf
5665 5658
     #echo 'passdb {' >> /etc/dovecot/conf.d/10-auth.conf
5666 5659
     #echo '  driver = passwd-file' >> /etc/dovecot/conf.d/10-auth.conf
5667 5660
     #echo '  args = /etc/dovecot/passwd-file' >> /etc/dovecot/conf.d/10-auth.conf