From 26f52e93aaea16dc664cb50749db66d658a509d5 Mon Sep 17 00:00:00 2001 From: MOIS3Y Date: Wed, 21 Sep 2022 03:16:11 +0900 Subject: [PATCH] Set DCImanager db name without ENV=var --- models_dci.py | 6 +++--- settings.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/models_dci.py b/models_dci.py index 14ca3fc..abde59e 100644 --- a/models_dci.py +++ b/models_dci.py @@ -64,12 +64,12 @@ class AuthUser(BaseModel): email = CharField(constraints=[SQL("DEFAULT ''")], unique=True) email_confirm = IntegerField(constraints=[SQL("DEFAULT 0")]) full_name = CharField(null=True) - ip_list = UnknownField(null=True) # json + ip_list = JSONField(null=True) # json lang = CharField(constraints=[SQL("DEFAULT 'en'")]) password = CharField(null=True) phone_number = CharField(null=True) - property = UnknownField(null=True) # json - roles = UnknownField() # json + property = JSONField(null=True) # json + roles = JSONField() # json ssh_priv_key = TextField(null=True) ssh_pub_key = TextField(null=True) state = CharField() diff --git a/settings.py b/settings.py index 128fdcb..2d981d6 100644 --- a/settings.py +++ b/settings.py @@ -18,6 +18,9 @@ if DB_PASSWORD is None: platform_config = json.load(f) DB_PASSWORD = platform_config.get("MysqlRootPassword") +if PLATFORM == "dci": + DB_NAME == "auth" + database = MySQLDatabase( DB_NAME, **{ 'charset': 'utf8',