From f4baa7b27393ac9d648ece9d7151f16827193bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 19 Aug 2020 18:26:44 +0200 Subject: [PATCH] Noggin: adjust variable names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/openshift-apps/noggin/templates/noggin.cfg.py | 2 +- roles/openshift-apps/noggin/templates/secrets.yml | 6 +++--- roles/openshift-apps/noggin/templates/wsgi.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/openshift-apps/noggin/templates/noggin.cfg.py b/roles/openshift-apps/noggin/templates/noggin.cfg.py index 3bc410cbc4..1f58d2dd25 100644 --- a/roles/openshift-apps/noggin/templates/noggin.cfg.py +++ b/roles/openshift-apps/noggin/templates/noggin.cfg.py @@ -34,4 +34,4 @@ THEME = "fas" FREEIPA_ADMIN_PASSWORD = from_file('/etc/noggin-secrets/ipa-admin') FERNET_SECRET = from_file('/etc/noggin-secrets/fernet').encode('utf-8') SECRET_KEY = from_file('/etc/noggin-secrets/session').encode('utf-8') -MAIL_PASSWORD = from_file('/etc/noggin-secrets/smtp') +#MAIL_PASSWORD = from_file('/etc/noggin-secrets/smtp') diff --git a/roles/openshift-apps/noggin/templates/secrets.yml b/roles/openshift-apps/noggin/templates/secrets.yml index ebaf4ec85c..e002e5648c 100644 --- a/roles/openshift-apps/noggin/templates/secrets.yml +++ b/roles/openshift-apps/noggin/templates/secrets.yml @@ -3,6 +3,6 @@ kind: Secret metadata: name: noggin-secrets stringData: - freeipa-admin-password: "{{ (env == 'production')|ternary(noggin_admin_password, noggin_stg_admin_password) }}" - fernet-secret: "{{ (env == 'production')|ternary(noggin_fernet_secret, noggin_stg_fernet_secret) }}" - session-secret: "{{ (env == 'production')|ternary(noggin_session_secret, noggin_stg_session_secret) }}" + ipa-admin: "{{ (env == 'production')|ternary(noggin_admin_password, noggin_stg_admin_password) }}" + fernet: "{{ (env == 'production')|ternary(noggin_fernet_secret, noggin_stg_fernet_secret) }}" + session: "{{ (env == 'production')|ternary(noggin_session_secret, noggin_stg_session_secret) }}" diff --git a/roles/openshift-apps/noggin/templates/wsgi.py b/roles/openshift-apps/noggin/templates/wsgi.py index 2b92e9c577..1c0ee2d6c0 100644 --- a/roles/openshift-apps/noggin/templates/wsgi.py +++ b/roles/openshift-apps/noggin/templates/wsgi.py @@ -1,4 +1,5 @@ from werkzeug.middleware.proxy_fix import ProxyFix -from noggin.app import app as application +from noggin.app import create_app +application = create_app() # application.wsgi_app.add_files('/etc/noggin/well-known-files', prefix='.well-known/') application.wsgi_app = ProxyFix(application.wsgi_app, x_proto=1, x_host=1)