Skip to content

Commit 0202479

Browse files
committed
Reverted. Added mu plugin to see if we can disable WP SSL verify.
1 parent c35849a commit 0202479

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

plugins/wpgraphql-logging/bin/install-test-env.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ install_db() {
4444
# create database
4545
echo -e "$(status_message "Creating the database (if it does not exist)...")"
4646

47-
RESULT=$(mysql --ssl-mode=DISABLED -u $WORDPRESS_DB_USER --password="$WORDPRESS_DB_PASSWORD" --skip-column-names -e "SHOW DATABASES LIKE '$WORDPRESS_DB_NAME'"$EXTRA)
47+
RESULT=$(mysql -u $WORDPRESS_DB_USER --password="$WORDPRESS_DB_PASSWORD" --skip-column-names -e "SHOW DATABASES LIKE '$WORDPRESS_DB_NAME'"$EXTRA)
4848
if [ "$RESULT" != $WORDPRESS_DB_NAME ]; then
49-
mysqladmin --ssl-mode=DISABLED create $WORDPRESS_DB_NAME --user="$WORDPRESS_DB_USER" --password="$WORDPRESS_DB_PASSWORD"$EXTRA
49+
mysqladmin create $WORDPRESS_DB_NAME --user="$WORDPRESS_DB_USER" --password="$WORDPRESS_DB_PASSWORD"$EXTRA
5050
fi
5151
}
5252

@@ -118,6 +118,12 @@ configure_wordpress() {
118118

119119
wp core install --title="$SITE_TITLE" --admin_user="$WORDPRESS_ADMIN_USER" --admin_password="$WORDPRESS_ADMIN_PASSWORD" --admin_email="$WORDPRESS_ADMIN_EMAIL" --skip-email --url="$WORDPRESS_URL" --allow-root
120120

121+
# Fix for WP 6.8+ SSL issue in tests
122+
echo -e "$(status_message "Adding mu-plugin to disable local SSL verification for tests...")"
123+
local MU_PLUGINS_DIR="$WORDPRESS_ROOT_DIR/wp-content/mu-plugins"
124+
mkdir -p "$MU_PLUGINS_DIR"
125+
echo "<?php add_filter( 'https_local_ssl_verify', '__return_false' );" > "$MU_PLUGINS_DIR/disable-local-ssl-verify.php"
126+
121127
echo -e "$(status_message "Running WordPress version: $(wp core version --allow-root) at $(wp option get home --allow-root)")"
122128
}
123129

plugins/wpgraphql-logging/docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ services:
3333
MYSQL_USER: ${WORDPRESS_DB_USER}
3434
MYSQL_PASSWORD: ${WORDPRESS_DB_PASSWORD}
3535
MYSQL_DATABASE: ${WORDPRESS_DB_NAME}
36-
command: --skip-ssl --ssl=0 --require-secure-transport=OFF
3736
volumes:
3837
- db:/var/lib/mysql
3938
networks:

0 commit comments

Comments
 (0)