From 993b5f0e24fb66fa8323ec0d1dd353adc682f6fb Mon Sep 17 00:00:00 2001 From: elena Date: Tue, 30 Aug 2022 16:58:30 +0200 Subject: [PATCH] fixed mysql-connector-python version. fixed mariadb conection user and pwd --- dd-sso/admin/docker/requirements.pip3 | 3 ++- dd-sso/admin/src/saml_scripts/wordpress_saml.py | 4 ++-- dd-sso/admin/src/wordpress_saml_onlycerts.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dd-sso/admin/docker/requirements.pip3 b/dd-sso/admin/docker/requirements.pip3 index 2fd988d..30e62ed 100644 --- a/dd-sso/admin/docker/requirements.pip3 +++ b/dd-sso/admin/docker/requirements.pip3 @@ -26,7 +26,8 @@ Flask-SocketIO==5.2.0 bcrypt==3.2.2 # diceware can't be upgraded without issues diceware==0.9.6 -mysql-connector-python==8.0.30 +# to avoid this error:mysql.connector.errors.ProgrammingError: Character set 'utf8' unsupported +mysql-connector-python==8.0.28 psycopg2==2.9.3 # python-keycloak can't be upgraded without issues python-keycloak==0.26.1 diff --git a/dd-sso/admin/src/saml_scripts/wordpress_saml.py b/dd-sso/admin/src/saml_scripts/wordpress_saml.py index 8b0a582..7aa7706 100644 --- a/dd-sso/admin/src/saml_scripts/wordpress_saml.py +++ b/dd-sso/admin/src/saml_scripts/wordpress_saml.py @@ -56,8 +56,8 @@ class WordpressSaml: self.db = Mysql( "dd-apps-mariadb", "wordpress", - "root", - os.environ["MARIADB_PASSWORD"], + os.environ["WORDPRESS_MARIADB_USER"], + os.environ["WORDPRESS_MARIADB_PASSWORD"], ) ready = True except: diff --git a/dd-sso/admin/src/wordpress_saml_onlycerts.py b/dd-sso/admin/src/wordpress_saml_onlycerts.py index 567f788..db3eac6 100644 --- a/dd-sso/admin/src/wordpress_saml_onlycerts.py +++ b/dd-sso/admin/src/wordpress_saml_onlycerts.py @@ -51,8 +51,8 @@ class WordpressSaml: self.db = Mysql( "dd-apps-mariadb", "wordpress", - "root", - os.environ["MARIADB_PASSWORD"], + os.environ["WORDPRESS_MARIADB_USER"], + os.environ["WORDPRESS_MARIADB_PASSWORD"], ) ready = True except: