Use RNG selector

This commit is contained in:
Bob Mottram 2015-06-14 19:20:59 +01:00
parent d971f4f75f
commit ca102a3820
1 changed files with 1 additions and 8 deletions

View File

@ -4796,13 +4796,6 @@ function random_number_generator {
if grep -Fxq "random_number_generator" $COMPLETION_FILE; then if grep -Fxq "random_number_generator" $COMPLETION_FILE; then
return return
fi fi
if [[ $INSTALLING_ON_BBB != "yes" ]]; then
# On systems which are not beaglebones assume that
# no hardware random number generator is available
# and use the second best option
apt-get -y install haveged
return
fi
if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
# it is assumed that docker uses the random number # it is assumed that docker uses the random number
# generator of the host system # generator of the host system
@ -5661,7 +5654,7 @@ function configure_imap {
#sed -i 's|#ssl_ca =.*|ssl_ca = /etc/ssl/certs/dovecot-ca.pem|g' /etc/dovecot/conf.d/10-ssl.conf #sed -i 's|#ssl_ca =.*|ssl_ca = /etc/ssl/certs/dovecot-ca.pem|g' /etc/dovecot/conf.d/10-ssl.conf
#sed -i 's|#ssl_cert_username_field =.*|ssl_cert_username_field = commonName|g' /etc/dovecot/conf.d/10-ssl.conf #sed -i 's|#ssl_cert_username_field =.*|ssl_cert_username_field = commonName|g' /etc/dovecot/conf.d/10-ssl.conf
#if ! grep -q "passdb {" /etc/dovecot/conf.d/10-auth.conf; then #if ! grep -q "passdb {" /etc/dovecot/conf.d/10-auth.conf; then
#echo '' >> /etc/dovecot/conf.d/10-auth.conf #echo '' >> /etc/dovecot/conf.d/10-auth.conf
#echo 'passdb {' >> /etc/dovecot/conf.d/10-auth.conf #echo 'passdb {' >> /etc/dovecot/conf.d/10-auth.conf
#echo ' driver = passwd-file' >> /etc/dovecot/conf.d/10-auth.conf #echo ' driver = passwd-file' >> /etc/dovecot/conf.d/10-auth.conf
#echo ' args = /etc/dovecot/passwd-file' >> /etc/dovecot/conf.d/10-auth.conf #echo ' args = /etc/dovecot/passwd-file' >> /etc/dovecot/conf.d/10-auth.conf