From bc511b4c7365173bebdb35f2d78fc7a9aabc35cf Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 4 Dec 2020 12:53:04 +0100
Subject: [PATCH] Updated password generator for mysql db creation

---
 CMS/nextcloud/conf.sh | 2 +-
 CMS/wordpress/conf.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh
index c414d20..66e99ba 100644
--- a/CMS/nextcloud/conf.sh
+++ b/CMS/nextcloud/conf.sh
@@ -15,7 +15,7 @@ touch /var/www/"$domain"/html/data/nextcloud.log > $OUTPUT 2>&1
 db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
 db_name="nextcloud_$db_suffix"
 db_user="nextcloud_$db_suffix"
-db_pass=$(date +%s|sha256sum|base64|head -c 32)
+db_pass=$(tr -dc 'A-Za-z0-9!#%()*+,-.:;<=>?@[]^_{|}~' </dev/urandom | head -c 30 ; echo)
 mysql -u root -p"$password" -e "CREATE DATABASE "$db_name" DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;" > $OUTPUT 2>&1
 mysql -u root -p"$password" -e "CREATE USER '"$db_user"'@'localhost' IDENTIFIED BY '"$db_pass"';" > $OUTPUT 2>&1
 mysql -u root -p"$password" -e "GRANT ALL ON "$db_name".* TO '"$db_user"'@'localhost';" > $OUTPUT 2>&1
diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh
index c588c0e..8a6b844 100644
--- a/CMS/wordpress/conf.sh
+++ b/CMS/wordpress/conf.sh
@@ -9,7 +9,7 @@ fi
 db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
 db_name="wp_$db_suffix"
 db_user="wp_$db_suffix"
-db_pass=$(date +%s|sha256sum|base64|head -c 32)
+db_pass=$(tr -dc 'A-Za-z0-9!#%()*+,-.:;<=>?@[]^_{|}~' </dev/urandom | head -c 30 ; echo)
 WPSalts=$(curl --retry 7 --retry-delay 5 -s https://api.wordpress.org/secret-key/1.1/salt/)
 
 #Setting up Database