From 8c00556bab081ca4320fea5452b3d07f168063d0 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 17 Nov 2015 17:13:49 -0500
Subject: [PATCH] use /dev/urandom for roundcube/owncloud key generation, see
 #596, partially reverts #115 (69f0e1d07a50f030b2120c0318cb6887dffbd0cd)

---
 setup/owncloud.sh | 2 +-
 setup/system.sh   | 2 ++
 setup/webmail.sh  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 34f54160..11c33dc6 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -133,7 +133,7 @@ EOF
 	# Create an auto-configuration file to fill in database settings
 	# when the install script is run. Make an administrator account
 	# here or else the install can't finish.
-	adminpassword=$(dd if=/dev/random bs=1 count=40 2>/dev/null | sha1sum | fold -w 30 | head -n 1)
+	adminpassword=$(dd if=/dev/urandom bs=1 count=40 2>/dev/null | sha1sum | fold -w 30 | head -n 1)
 	cat > /usr/local/lib/owncloud/config/autoconfig.php <<EOF;
 <?php
 \$AUTOCONFIG = array (
diff --git a/setup/system.sh b/setup/system.sh
index fe055c3b..125a4fe0 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -65,6 +65,8 @@ apt_install python3 python3-dev python3-pip \
 # * TLS private key (see `ssl.sh`, which calls `openssl genrsa`)
 # * DNSSEC signing keys (see `dns.sh`)
 # * our management server's API key (via Python's os.urandom method)
+# * Roundcube's SECRET_KEY (`webmail.sh`)
+# * ownCloud's administrator account password (`owncloud.sh`)
 #
 # Why /dev/urandom? It's the same as /dev/random, except that it doesn't wait
 # for a constant new stream of entropy. In practice, we only need a little
diff --git a/setup/webmail.sh b/setup/webmail.sh
index 90b1db00..fafac75f 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -75,7 +75,7 @@ fi
 # ### Configuring Roundcube
 
 # Generate a safe 24-character secret key of safe characters.
-SECRET_KEY=$(dd if=/dev/random bs=1 count=18 2>/dev/null | base64 | fold -w 24 | head -n 1)
+SECRET_KEY=$(dd if=/dev/urandom bs=1 count=18 2>/dev/null | base64 | fold -w 24 | head -n 1)
 
 # Create a configuration file.
 #