Replace mysql with mariadb command
Some checks failed
Docker Image CI / build-recursor-latest (push) Has been cancelled
Docker Image CI / build-recursor-alpine (push) Has been cancelled
Docker Image CI / build-pdns-mysql-latest (push) Has been cancelled
Docker Image CI / build-pdns-mysql-alpine (push) Has been cancelled
Docker Image CI / build-pdns-pgsql-latest (push) Has been cancelled
Docker Image CI / build-pdns-pgsql-alpine (push) Has been cancelled
Docker Image CI / build-pdns-admin (push) Has been cancelled

This commit is contained in:
Peter Schiffer 2025-01-01 22:30:06 +01:00
parent 036420859d
commit 9618517672
No known key found for this signature in database
GPG key ID: F2A18AC34A008397
2 changed files with 2 additions and 2 deletions

View file

@ -39,7 +39,7 @@ subvars --prefix 'PDNS_ADMIN_' < '/config.py.tpl' > '/opt/powerdns-admin/powerdn
# Initialize DB if needed # Initialize DB if needed
if [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'mysql' ]]; then if [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'mysql' ]]; then
SQL_COMMAND="mysql -h ${PDNS_ADMIN_SQLA_DB_HOST} -P ${PDNS_ADMIN_SQLA_DB_PORT} -u ${PDNS_ADMIN_SQLA_DB_USER} -p${PDNS_ADMIN_SQLA_DB_PASSWORD} -e" SQL_COMMAND="mariadb -h ${PDNS_ADMIN_SQLA_DB_HOST} -P ${PDNS_ADMIN_SQLA_DB_PORT} -u ${PDNS_ADMIN_SQLA_DB_USER} -p${PDNS_ADMIN_SQLA_DB_PASSWORD} -e"
elif [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'postgres' ]]; then elif [[ "${PDNS_ADMIN_SQLA_DB_TYPE}" == 'postgres' ]]; then
PGPASSWORD="${PDNS_ADMIN_SQLA_DB_PASSWORD}" PGPASSWORD="${PDNS_ADMIN_SQLA_DB_PASSWORD}"
export PGPASSWORD export PGPASSWORD

View file

@ -51,7 +51,7 @@ generateMySQLCommand() {
EXTRA="${EXTRA} --socket=${PDNS_gmysql_socket}" EXTRA="${EXTRA} --socket=${PDNS_gmysql_socket}"
fi fi
MYSQL_COMMAND="mysql -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user}${EXTRA}" MYSQL_COMMAND="mariadb -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user}${EXTRA}"
} }
createDatabaseIfRequested() { createDatabaseIfRequested() {