diff --git a/login_server/src/cpp/Gradido_LoginServer.cpp b/login_server/src/cpp/Gradido_LoginServer.cpp index 576316cf5..82d7e9b55 100644 --- a/login_server/src/cpp/Gradido_LoginServer.cpp +++ b/login_server/src/cpp/Gradido_LoginServer.cpp @@ -167,11 +167,12 @@ int Gradido_LoginServer::main(const std::vector& args) // *************** load from config ******************************************** std::string cfg_Path = Poco::Path::config() + "grd_login/"; - if (mConfigPath != "") { - cfg_Path = mConfigPath; - } try { - loadConfiguration(cfg_Path + "grd_login.properties"); + if(mConfigPath != "") { + loadConfiguration(mConfigPath); + } else { + loadConfiguration(cfg_Path + "grd_login.properties"); + } } catch (Poco::Exception& ex) { errorLog.error("error loading config: %s", ex.displayText()); @@ -298,4 +299,4 @@ int Gradido_LoginServer::main(const std::vector& args) } return Application::EXIT_OK; -} \ No newline at end of file +} diff --git a/mariadb/setup_dbs_different_user.sh b/mariadb/setup_dbs_different_user.sh index 604276ef3..e4c0820f7 100755 --- a/mariadb/setup_dbs_different_user.sh +++ b/mariadb/setup_dbs_different_user.sh @@ -3,12 +3,12 @@ COLOR_GREEN="\033[0;32m" COLOR_YELLOW="\e[33m" COLOR_NONE="\033[0m" -LOGIN_DB_USER=gradido_login -LOGIN_DB_NAME=gradido_login +LOGIN_DB_USER=gradido_login_live +LOGIN_DB_NAME=gradido_login_live LOGIN_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); -COMMUNITY_DB_USER=gradido_community -COMMUNITY_DB_NAME=gradido_community +COMMUNITY_DB_USER=gradido_community_live +COMMUNITY_DB_NAME=gradido_community_live COMMUNITY_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); # create table