From 98dfa29c178f9358725620a348a54b99542b2f46 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 14 Sep 2018 10:28:49 +0200
Subject: [PATCH] Replace CSENTRY_STAGING with CSENTRY_ENVIRONMENT
CSENTRY_ENVIRONMENT shall be set to production|staging|development
It can be used when sending errors to Sentry
JIRA INFRA-525
---
app/settings.py | 2 +-
app/templates/base.html | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/settings.py b/app/settings.py
index 5b9c946..8ff1de0 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -68,7 +68,7 @@ TEMPORARY_ICS_ID = "ZZ"
MAC_OUI = "02:42:42"
DOCUMENTATION_URL = "http://ics-infrastructure.pages.esss.lu.se/csentry/index.html"
-CSENTRY_STAGING = False
+CSENTRY_ENVIRONMENT = "staging"
AWX_URL = "https://torn.tn.esss.lu.se"
# AWX job templates
diff --git a/app/templates/base.html b/app/templates/base.html
index 4996d0d..79d304a 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -15,8 +15,8 @@
{% block navbar %}
<!-- Fixed navbar -->
<div class="navbar fixed-top navbar-expand-lg navbar-light bg-light" role="navigation">
- <a class="navbar-brand{% if config['CSENTRY_STAGING'] %} text-danger{% endif %}"
- href="{{ url_for('main.index') }}">CSEntry{% if config['CSENTRY_STAGING'] %}-test{% endif %}</a>
+ <a class="navbar-brand{% if config['CSENTRY_ENVIRONMENT'] == "staging" %} text-danger{% endif %}"
+ href="{{ url_for('main.index') }}">CSEntry{% if config['CSENTRY_ENVIRONMENT'] == "staging" %}-test{% endif %}</a>
<button class="navbar-toggler" type="button" data-toggle="collapse"
data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
--
GitLab