From f616dc054f5c9d2077e6562f9543ca1f1227865b Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 13 Apr 2024 22:24:30 +0200
Subject: [PATCH 1/2] allow overriding password during local testing

---
 bin/dev/autotest.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/dev/autotest.sh b/bin/dev/autotest.sh
index b6f67cf118..604e99fcdb 100755
--- a/bin/dev/autotest.sh
+++ b/bin/dev/autotest.sh
@@ -152,8 +152,8 @@ function execute_tests() {
             echo "To use the docker container set the USEDOCKER environment variable"
             exit 3
           fi
-          mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
-          mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
+          mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
+          mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
         else
           DATABASE_HOST=mysql
         fi
@@ -185,8 +185,8 @@ function execute_tests() {
             echo "To use the docker container set the USEDOCKER environment variable"
             exit 3
           fi
-          mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
-          mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
+          mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true
+          mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST}
         else
           DATABASE_HOST=mariadb
         fi
@@ -203,7 +203,7 @@ function execute_tests() {
 
     if [ -n "${USEDOCKER}" ]; then
       echo "Initialize database..."
-      docker exec ${DOCKER_CONTAINER_ID} mysql -u root -pfriendica -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};"
+      docker exec ${DOCKER_CONTAINER_ID} mysql -u root -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};"
     fi
 
     export MYSQL_HOST="${DATABASE_HOST}"

From e24d1da13b5d7f4e61292368a40c37a27177d841 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 14 Apr 2024 09:06:48 +0200
Subject: [PATCH 2/2] tidy up more password definitions

---
 bin/dev/autotest.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/dev/autotest.sh b/bin/dev/autotest.sh
index 604e99fcdb..a7a908327c 100755
--- a/bin/dev/autotest.sh
+++ b/bin/dev/autotest.sh
@@ -138,9 +138,9 @@ function execute_tests() {
       if [ -n "${USEDOCKER}" ]; then
         echo "Fire up the mysql docker"
         DOCKER_CONTAINER_ID=$(docker run \
-          -e MYSQL_ROOT_PASSWORD=friendica \
+          -e MYSQL_ROOT_PASSWORD="${DATABASE_PASSWORD}" \
           -e MYSQL_USER="${DATABASE_USER}" \
-          -e MYSQL_PASSWORD=friendica \
+          -e MYSQL_PASSWORD="${DATABASE_PASSWORD}" \
           -e MYSQL_DATABASE="${DATABASE_NAME}" \
           -d mysql)
         DATABASE_HOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "${DOCKER_CONTAINER_ID}")
@@ -171,9 +171,9 @@ function execute_tests() {
       if [ -n "${USEDOCKER}" ]; then
         echo "Fire up the mariadb docker"
         DOCKER_CONTAINER_ID=$(docker run \
-          -e MYSQL_ROOT_PASSWORD=friendica \
+          -e MYSQL_ROOT_PASSWORD="${DATABASE_PASSWORD}" \
           -e MYSQL_USER="${DATABASE_USER}" \
-          -e MYSQL_PASSWORD=friendica \
+          -e MYSQL_PASSWORD="${DATABASE_PASSWORD}" \
           -e MYSQL_DATABASE="${DATABASE_NAME}" \
           -d mariadb)
         DATABASE_HOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "${DOCKER_CONTAINER_ID}")
@@ -210,7 +210,7 @@ function execute_tests() {
 
     #call installer
     echo "Installing Friendica..."
-    "${PHP}" ./bin/console.php autoinstall --dbuser="${DATABASE_USER}" --dbpass=friendica --dbdata="${DATABASE_NAME}" --dbhost="${DATABASE_HOST}" --url=https://friendica.local --admin=admin@friendica.local
+    "${PHP}" ./bin/console.php autoinstall --dbuser="${DATABASE_USER}" --dbpass="${DATABASE_PASSWORD}" --dbdata="${DATABASE_NAME}" --dbhost="${DATABASE_HOST}" --url=https://friendica.local --admin=admin@friendica.local
   fi
 
   #test execution