From bb3fd0992080052fbdc7483bb49bbc4429be1606 Mon Sep 17 00:00:00 2001 From: Gilles Dubois Date: Tue, 17 Mar 2020 16:50:26 +0100 Subject: [PATCH 1/2] Add SQL Port management for webconsole --- dev/conf/dbconfig.inc.php | 1 + dev/scripts/docker-entrypoint.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/dev/conf/dbconfig.inc.php b/dev/conf/dbconfig.inc.php index 2852a1a..943a027 100644 --- a/dev/conf/dbconfig.inc.php +++ b/dev/conf/dbconfig.inc.php @@ -23,6 +23,7 @@ define("DB_NAME", "OCS_DB_NAME"); define("SERVER_READ", "OCS_READ_NAME"); define("SERVER_WRITE", "OCS_WRITE_NAME"); +define("SERVER_PORT", "OCS_DB_PORT"); define("COMPTE_BASE", "OCS_DB_USER"); define("PSWD_BASE", "OCS_DB_PASS"); define("ENABLE_SSL","OCS_SSL_ENABLED"); diff --git a/dev/scripts/docker-entrypoint.sh b/dev/scripts/docker-entrypoint.sh index a956084..10bd3b7 100755 --- a/dev/scripts/docker-entrypoint.sh +++ b/dev/scripts/docker-entrypoint.sh @@ -66,6 +66,7 @@ cp /tmp/dbconfig.inc.php $OCS_WEBCONSOLE_DIR sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_DB_PORT/'"$OCS_DB_PORT"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php From 38214119c1265df96b7f3400f4ed020ff4bc5d79 Mon Sep 17 00:00:00 2001 From: Gilles Dubois Date: Tue, 17 Mar 2020 16:50:33 +0100 Subject: [PATCH 2/2] Add SQL Port management for webconsole --- nightly/conf/dbconfig.inc.php | 1 + nightly/scripts/docker-entrypoint.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/nightly/conf/dbconfig.inc.php b/nightly/conf/dbconfig.inc.php index 2852a1a..943a027 100644 --- a/nightly/conf/dbconfig.inc.php +++ b/nightly/conf/dbconfig.inc.php @@ -23,6 +23,7 @@ define("DB_NAME", "OCS_DB_NAME"); define("SERVER_READ", "OCS_READ_NAME"); define("SERVER_WRITE", "OCS_WRITE_NAME"); +define("SERVER_PORT", "OCS_DB_PORT"); define("COMPTE_BASE", "OCS_DB_USER"); define("PSWD_BASE", "OCS_DB_PASS"); define("ENABLE_SSL","OCS_SSL_ENABLED"); diff --git a/nightly/scripts/docker-entrypoint.sh b/nightly/scripts/docker-entrypoint.sh index 653c55f..27ee8e2 100755 --- a/nightly/scripts/docker-entrypoint.sh +++ b/nightly/scripts/docker-entrypoint.sh @@ -58,6 +58,7 @@ cp /tmp/conf/dbconfig.inc.php $OCS_WEBCONSOLE_DIR sed -i 's/OCS_DB_NAME/'"$OCS_DB_NAME"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_READ_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_WRITE_NAME/'"$OCS_DB_SERVER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php +sed -i 's/OCS_DB_PORT/'"$OCS_DB_PORT"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_USER/'"$OCS_DB_USER"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_DB_PASS/'"$OCS_DB_PASS"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php sed -i 's/OCS_SSL_ENABLED/'"$OCS_SSL_ENABLED"'/g' $OCS_WEBCONSOLE_DIR/dbconfig.inc.php