From 9a6d9c41029d2df5612d411a5d58e6c436ebebd1 Mon Sep 17 00:00:00 2001 From: Chris Grycki Date: Mon, 22 Aug 2022 03:39:42 -0500 Subject: [PATCH] [bitnami/moodle] Add support for auroramysql driver (#1696) Signed-off-by: Chris Grycki Signed-off-by: Chris Grycki --- .../3/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh | 6 +++--- .../4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh | 6 +++--- bitnami/moodle/README.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bitnami/moodle/3/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/3/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh index 11d6f2e507ac..0e9b7f1ac69f 100644 --- a/bitnami/moodle/3/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh +++ b/bitnami/moodle/3/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh @@ -87,7 +87,7 @@ moodle_validate() { fi # Support for MySQL and MariaDB - check_multi_value "MOODLE_DATABASE_TYPE" "mysqli mariadb pgsql" + check_multi_value "MOODLE_DATABASE_TYPE" "mysqli mariadb pgsql auroramysql" # Check that the web server is properly set up web_server_validate || print_validation_error "Web server validation failed" @@ -145,7 +145,7 @@ moodle_initialize() { db_name="$MOODLE_DATABASE_NAME" db_user="$MOODLE_DATABASE_USER" db_pass="$MOODLE_DATABASE_PASSWORD" - [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" || "$db_type" = "auroramysql" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" [[ "$db_type" = "pgsql" ]] && moodle_wait_for_postgresql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" # Create Moodle install argument list, allowing to pass custom options via 'MOODLE_INSTALL_EXTRA_ARGS' @@ -204,7 +204,7 @@ EOF db_name="$(moodle_conf_get "\$CFG->dbname")" db_user="$(moodle_conf_get "\$CFG->dbuser")" db_pass="$(moodle_conf_get "\$CFG->dbpass")" - [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" || "$db_type" = "auroramysql" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" [[ "$db_type" = "pgsql" ]] && moodle_wait_for_postgresql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" # Perform Moodle database schema upgrade diff --git a/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh index 11d6f2e507ac..0e9b7f1ac69f 100644 --- a/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh +++ b/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh @@ -87,7 +87,7 @@ moodle_validate() { fi # Support for MySQL and MariaDB - check_multi_value "MOODLE_DATABASE_TYPE" "mysqli mariadb pgsql" + check_multi_value "MOODLE_DATABASE_TYPE" "mysqli mariadb pgsql auroramysql" # Check that the web server is properly set up web_server_validate || print_validation_error "Web server validation failed" @@ -145,7 +145,7 @@ moodle_initialize() { db_name="$MOODLE_DATABASE_NAME" db_user="$MOODLE_DATABASE_USER" db_pass="$MOODLE_DATABASE_PASSWORD" - [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" || "$db_type" = "auroramysql" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" [[ "$db_type" = "pgsql" ]] && moodle_wait_for_postgresql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" # Create Moodle install argument list, allowing to pass custom options via 'MOODLE_INSTALL_EXTRA_ARGS' @@ -204,7 +204,7 @@ EOF db_name="$(moodle_conf_get "\$CFG->dbname")" db_user="$(moodle_conf_get "\$CFG->dbuser")" db_pass="$(moodle_conf_get "\$CFG->dbpass")" - [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + [[ "$db_type" = "mariadb" || "$db_type" = "mysqli" || "$db_type" = "auroramysql" ]] && moodle_wait_for_mysql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" [[ "$db_type" = "pgsql" ]] && moodle_wait_for_postgresql_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" # Perform Moodle database schema upgrade diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md index 39dca29ef862..3c79c514f2cb 100644 --- a/bitnami/moodle/README.md +++ b/bitnami/moodle/README.md @@ -228,7 +228,7 @@ Available environment variables: ##### Use an existing database -- `MOODLE_DATABASE_TYPE`: Database type. Valid values: *mariadb*, *mysqli*, *pgsql*. Default: **mariadb** +- `MOODLE_DATABASE_TYPE`: Database type. Valid values: *mariadb*, *mysqli*, *pgsql*, *auroramysql*. Default: **mariadb** - `MOODLE_DATABASE_HOST`: Hostname for database server. Default: **mariadb** - `MOODLE_DATABASE_PORT_NUMBER`: Port used by database server. Default: **3306** - `MOODLE_DATABASE_NAME`: Database name that Moodle will use to connect with the database. Default: **bitnami_moodle**