From d0121930c05bc6a536e0ef6c56137d133f833f92 Mon Sep 17 00:00:00 2001
From: Yurii Pavlov <mailyurik@gmail.com>
Date: Wed, 24 Jul 2024 19:24:54 +0200
Subject: [PATCH] update wp admin password generation

---
 sh/env/.env.secret.template | 2 +-
 sh/wp-cli/core-install.sh   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sh/env/.env.secret.template b/sh/env/.env.secret.template
index b0a621e..ddd279c 100644
--- a/sh/env/.env.secret.template
+++ b/sh/env/.env.secret.template
@@ -33,7 +33,7 @@ WP_DB_CHARSET=utf8mb4
 # Default admin for WorPress installation
 WP_ADMIN_USER=admin
 WP_ADMIN_EMAIL=admin@example.com
-#WP_ADMIN_PASSWORD will be generated in installation script
+WP_ADMIN_PASSWORD=generate_this_pass
 
 # Authentication unique keys and salts
 WP_AUTH_KEY='generate_key'
diff --git a/sh/wp-cli/core-install.sh b/sh/wp-cli/core-install.sh
index de56d79..dfb0fd9 100644
--- a/sh/wp-cli/core-install.sh
+++ b/sh/wp-cli/core-install.sh
@@ -18,9 +18,7 @@ if [ -z "$WP_HOME" ]; then
   echo -e "${LIGHTRED}[Error]${NOCOLOR} WP_HOME is not defined in wp-config.php"; exit 1;
 fi
 
-WP_ADMIN_PASSWORD=$(tr -dc 'A-Za-z0-9_' </dev/urandom | head -c 25)
-
-# Use WP_HOME, WP_ADMIN_USER, WP_ADMIN_EMAIL from .env
+# Using WP_HOME, WP_ADMIN_USER, WP_ADMIN_EMAIL, WP_ADMIN_PASSWORD from .env.secret file
 # Run the wp core install command and capture its output in a variable
 wp core install \
   --url="$WP_HOME" \
@@ -33,4 +31,5 @@ wp rewrite structure '/%postname%/' --hard
 
 echo -e "${LIGHTGREEN}[Success]${NOCOLOR} Admin username: ${LIGHTYELLOW}$WP_ADMIN_USER${NOCOLOR}"
 echo -e "${LIGHTGREEN}[Success]${NOCOLOR} Admin password: ${LIGHTYELLOW}$WP_ADMIN_PASSWORD${NOCOLOR}"
+echo -e "${CYAN}[Info]${NOCOLOR} You can find this credentials in 'config/environment/.env.secret' file"
 echo -e "${LIGHTYELLOW}[Warning]${NOCOLOR} Store your password in safe place"