From aea340bf461d04e33e1f1dc4071b04d39cf3d647 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Sun, 23 Dec 2018 14:50:26 +0100
Subject: [PATCH] Fixed issue with missing admin password when started with no
repo db.
---
nomad/config.py | 2 +-
nomad/infrastructure.py | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/nomad/config.py b/nomad/config.py
index bb1c7a3799..413c9ce102 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -110,7 +110,7 @@ services = NomadServicesConfig(
api_base_path=os.environ.get('NOMAD_API_BASE_PATH', '/nomad/api'),
api_secret=os.environ.get('NOMAD_API_SECRET', 'defaultApiSecret'),
admin_password=os.environ.get('NOMAD_API_ADMIN_PASSWORD', 'password'),
- disable_reset=os.environ.get('NOMAD_API_DISABLE_RESET', 'true') == 'false'
+ disable_reset=os.environ.get('NOMAD_API_DISABLE_RESET', 'false') == 'true'
)
console_log_level = get_loglevel_from_env('NOMAD_CONSOLE_LOGLEVEL', default_level=logging.INFO)
diff --git a/nomad/infrastructure.py b/nomad/infrastructure.py
index 02f6499bda..1657884365 100644
--- a/nomad/infrastructure.py
+++ b/nomad/infrastructure.py
@@ -128,6 +128,11 @@ def setup_repository_db():
"select exists(select * from information_schema.tables "
"where table_name='users')")
exists = cur.fetchone()[0]
+ if not exists:
+ logger.info('repository db postgres schema does not exists')
+ reset_repository_db()
+ else:
+ logger.info('repository db postgres schema already exists')
# set the admin user password
with repository_db_connection() as conn:
@@ -136,12 +141,6 @@ def setup_repository_db():
"UPDATE public.users SET password='%s' WHERE user_id=1;" %
bcrypt.encrypt(config.services.admin_password, ident='2y'))
- if not exists:
- logger.info('repository db postgres schema does not exists')
- reset_repository_db()
- else:
- logger.info('repository db postgres schema already exists')
-
global repository_db
global repository_db_conn
--
GitLab