diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef4797f65d01d6c1a5c7a4ff863f7b142f48dee9..f99432f7b8e23c77fe87d5814ca1c4caef6a076a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ deploy_testing:
variables:
DB_NAME : /var/www/test/$CI_COMMIT_REF_NAME/.db/members.db
DEPLOY_HOST : $CI_COMMIT_REF_NAME.test.ucc.asn.au
+ SHORT_ENV_NAME : TEST
script:
- echo "Deploy to test"
- rm -f /var/www/test/$CI_COMMIT_REF_NAME
@@ -44,7 +45,7 @@ deploy_testing:
on_stop: stop_testing
except:
- master
-
+
deploy_staging:
stage: deploy
tags:
@@ -52,6 +53,7 @@ deploy_staging:
variables:
DB_NAME : /var/www/stage/.db/members.db
DEPLOY_HOST : stage.test.ucc.asn.au
+ SHORT_ENV_NAME : STAGE
script:
- echo "Deploy to staging"
- rm -f /services/$CI_PROJECT_NAME
diff --git a/src/gms/context_processors.py b/src/gms/context_processors.py
new file mode 100644
index 0000000000000000000000000000000000000000..c041f717eb94834ca461e0d48c4c4ca349a2ff58
--- /dev/null
+++ b/src/gms/context_processors.py
@@ -0,0 +1,6 @@
+from django.conf import settings
+
+def global_settings(request):
+ return {
+ 'DEPLOYMENT_ENV' : settings.ENV
+ }
diff --git a/src/gms/settings.py b/src/gms/settings.py
index 8354958c4897e4015db45a679eb803a827f91d8e..c86e13f50406aa236ac4b094909882090dd9cded 100644
--- a/src/gms/settings.py
+++ b/src/gms/settings.py
@@ -24,7 +24,7 @@ INSTALLED_APPS = (
'memberdb',
'import_members',
'squarepay',
- 'formtools'
+ 'formtools',
)
MIDDLEWARE = [
@@ -88,6 +88,7 @@ TEMPLATES = [
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
+ 'gms.context_processors.global_settings'
],
},
},
diff --git a/src/gms/settings_local.example.py b/src/gms/settings_local.example.py
index dd91a37f199d522fb91248d6827c7108381d4ae5..d84b90072f08b46d7ab3ca835791deacd770821f 100644
--- a/src/gms/settings_local.example.py
+++ b/src/gms/settings_local.example.py
@@ -7,29 +7,31 @@ ROOT_DIR = os.path.dirname(BASE_DIR)
DEBUG = True
+ENV = '${SHORT_ENV_NAME}'
+
ADMINS = (
- ('UCC Committee', 'committee-only@ucc.asn.au'),
+ ('UCC Committee', 'committee-only@ucc.asn.au'),
)
### Database connection options ###
DATABASES = {
- 'default': {
- 'ENGINE': '${DB_ENGINE}', # Add 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- # this should end up in uccportal/.db/members.db
- 'NAME': '${DB_NAME}', # Or path to database file if using sqlite3.
- 'USER': '${DB_USER}', # Not used with sqlite3.
- 'PASSWORD': '${DB_SECRET}', # Not used with sqlite3.
- 'HOST': '${DB_HOST}', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
- },
- 'memberdb_old': {
- 'ENGINE': 'django.db.backends.postgresql',
- 'NAME': 'uccmemberdb_2018',
- 'USER': 'uccmemberdb',
- 'PASSWORD': '${OLDDB_SECRET}',
- 'HOST': 'mussel.ucc.gu.uwa.edu.au',
- 'PORT': '',
- }
+ 'default': {
+ 'ENGINE': '${DB_ENGINE}', # Add 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ # this should end up in uccportal/.db/members.db
+ 'NAME': '${DB_NAME}', # Or path to database file if using sqlite3.
+ 'USER': '${DB_USER}', # Not used with sqlite3.
+ 'PASSWORD': '${DB_SECRET}', # Not used with sqlite3.
+ 'HOST': '${DB_HOST}', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ },
+ 'memberdb_old': {
+ 'ENGINE': 'django.db.backends.postgresql',
+ 'NAME': 'uccmemberdb_2018',
+ 'USER': 'uccmemberdb',
+ 'PASSWORD': '${OLDDB_SECRET}',
+ 'HOST': 'mussel.ucc.gu.uwa.edu.au',
+ 'PORT': '',
+ }
}
# Make this unique, and don't share it with anybody.
@@ -56,7 +58,7 @@ AUTH_LDAP_SERVER_URI = 'ldaps://ad.ucc.gu.uwa.edu.au/'
# This is also a bad idea, should be changed in production
AUTH_LDAP_GLOBAL_OPTIONS = {
- ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER,
+ ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER,
}
# directly attempt to authenticate users to bind to LDAP
@@ -69,27 +71,27 @@ AUTH_LDAP_FIND_GROUP_PERMS = False
AUTH_LDAP_USER_DN_TEMPLATE = 'CN=%(user)s,CN=Users,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au'
AUTH_LDAP_GROUP_SEARCH = LDAPSearch("OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au",
- ldap.SCOPE_SUBTREE, "(objectClass=group)")
+ ldap.SCOPE_SUBTREE, "(objectClass=group)")
# Populate the Django user from the LDAP directory.
# note: somehow the LDAP/AD users don't have firstName/sn, rather the full name is in name or displayName
AUTH_LDAP_USER_ATTR_MAP = {
- "first_name": "givenName",
- "last_name": "sn",
- "email": "email",
+ "first_name": "givenName",
+ "last_name": "sn",
+ "email": "email",
}
ADMIN_ACCESS_QUERY = \
- LDAPGroupQuery("CN=committee,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au") | \
- LDAPGroupQuery("CN=door,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au") | \
- LDAPGroupQuery("CN=wheel,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au")
+ LDAPGroupQuery("CN=committee,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au") | \
+ LDAPGroupQuery("CN=door,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au") | \
+ LDAPGroupQuery("CN=wheel,OU=Groups,DC=ad,DC=ucc,DC=gu,DC=uwa,DC=edu,DC=au")
AUTH_LDAP_USER_FLAGS_BY_GROUP = {
- # staff can login to the admin site
- "is_staff": ADMIN_ACCESS_QUERY,
+ # staff can login to the admin site
+ "is_staff": ADMIN_ACCESS_QUERY,
- # superusers have all permissions (but also need staff to login to admin site)
- "is_superuser": ADMIN_ACCESS_QUERY,
+ # superusers have all permissions (but also need staff to login to admin site)
+ "is_superuser": ADMIN_ACCESS_QUERY,
}
# the Square app and location data (set to sandbox unless you want it to charge people)
diff --git a/src/templates/base.html b/src/templates/base.html
index e152ae96e194ed63a3408ef0a6671bcb832e0049..06849d276ae778da669496f2e8a8167ad4a7ae83 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -2,96 +2,115 @@
<!DOCTYPE html>
<html>
<head>
- <!-- MemberDB base template -->
- <title>{% block title %}UCC MemberDB{% endblock %}</title>
- <link rel="shortcut icon" type="image/png" href="{% static 'ucc-logo.png' %}"/>
- <link rel="stylesheet" type="text/css" href="{% static "memberdb.css" %}">
- {% block prestyle %}{% endblock %}
- <link rel="stylesheet" type="text/css" href="{% static "shared.css" %}">
- {% block extrahead %}{% endblock %}
- {% block extrastyle %}{% endblock %}
- {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE">{% endblock %}
+ <!-- MemberDB base template -->
+ <title>{% block title %}UCC MemberDB{% endblock %}</title>
+ <link rel="shortcut icon" type="image/png" href="{% static 'ucc-logo.png' %}"/>
+ <link rel="stylesheet" type="text/css" href="{% static "memberdb.css" %}">
+ {% block prestyle %}{% endblock %}
+ <link rel="stylesheet" type="text/css" href="{% static "shared.css" %}">
+ {% block extrahead %}{% endblock %}
+ {% block extrastyle %}{% endblock %}
+ {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE">{% endblock %}
</head>
<body {% block bodyattrs %}{% endblock %}>
+
<!-- Container -->
<div id="container">
+ {% block header_div %}<!-- Header -->
+ <div id="header">
+ {% block navbar %}
+ <nav>
+ {% block branding %}
+ <a class="logo" title="UCCPortal homepage">
+ <span></span>
+ </a>
+ {% endblock %}
+
+ {# fancy automatic navbar thing from https://stackoverflow.com/questions/39639264 #}
+ {% with url_name=request.resolver_match.url_name %}
+ {% if request.member %}
+ <a class="navtab {% if url_name == 'home' %}active{% endif %}" href="{% url "memberdb:home" %}">Member home</a>
+ {% endif %}
+ <a class="navtab {% if url_name == 'register' %}active{% endif %}" href="{% url "memberdb:register" %}">Register</a>
- {% block header_div %}<!-- Header -->
- <div id="header">
- {% block navbar %}
- <nav>
- {% block branding %}
- <a class="logo" title="UCCPortal homepage">
- <span></span>
- </a>
- {% endblock %}
-
- {# fancy automatic navbar thing from https://stackoverflow.com/questions/39639264 #}
- {% with url_name=request.resolver_match.url_name %}
- {% if request.member %}
- <a class="navtab {% if url_name == 'home' %}active{% endif %}" href="{% url "memberdb:home" %}">Member home</a>
- {% endif %}
- <a class="navtab {% if url_name == 'register' %}active{% endif %}" href="{% url "memberdb:register" %}">Register</a>
+ {% if not request.user.is_authenticated %}
+ <a class="navtab {% if url_name == 'login' %}active{% endif %}" href="{% url "memberdb:login" %}">Login</a>
+ {% else %}
+ <a class="navtab {% if url_name == 'renew' %}active{% endif %}" href="{% url "memberdb:renew" %}">Renew membership</a>
- {% if not request.user.is_authenticated %}
- <a class="navtab {% if url_name == 'login' %}active{% endif %}" href="{% url "memberdb:login" %}">Login</a>
- {% else %}
- <a class="navtab {% if url_name == 'renew' %}active{% endif %}" href="{% url "memberdb:renew" %}">Renew membership</a>
+ {% if request.user.is_staff %}
+ <a class="navtab {% block adminactive %}{% endblock %}" href="{% url "admin:index" %}">Admin site</a>
+ {% endif %}
- {% if request.user.is_staff %}
- <a class="navtab {% block adminactive %}{% endblock %}" href="{% url "admin:index" %}">Admin site</a>
- {% endif %}
+ {% endif %}
- {% endif %}
+ {% if request.user.is_authenticated or request.member %}
+ <a class="navtab {% if url_name == 'logout' %}active{% endif %}" href="{% url "memberdb:logout" %}">Logout</a>
+ {% endif %}
+ {% endwith %}
+ </nav>
+ {% endblock %}
- {% if request.user.is_authenticated or request.member %}
- <a class="navtab {% if url_name == 'logout' %}active{% endif %}" href="{% url "memberdb:logout" %}">Logout</a>
- {% endif %}
- {% endwith %}
- </nav>
- {% endblock %}
+ {% block header %}{% endblock %}
- {% block header %}{% endblock %}
-
- </div>
- {% endblock %}<!-- END Header -->
- {% block breadcrumbs %}{% endblock %}
- {% block messages %}{% if messages %}
- <ul class="messagelist">{% for message in messages %}
- <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
- {% endfor %}</ul>
- {% endif %}{% endblock messages %}
+ </div>
+ {% endblock %}<!-- END Header -->
+ {% block breadcrumbs %}{% endblock %}
+ {% block messages %}{% if messages %}
+ <ul class="messagelist">{% for message in messages %}
+ <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
+ {% endfor %}</ul>
+ {% endif %}{% endblock messages %}
- <!-- Content -->
- <div id="content">
- {% block pretitle %}{% endblock %}
- {% block content_title %}<h1></h1>{% endblock %}
- {% block content %}
- {% endblock %}
- <!-- sidebar -->
- {% block sidebar %}{% endblock %}
- <br class="clear">
- </div>
- <!-- END Content -->
+ <!-- Content -->
+ <div id="content">
+ {% block pretitle %}{% endblock %}
+ {% block content_title %}<h1></h1>{% endblock %}
+ {% block content %}
+ {% endblock %}
+ <!-- sidebar -->
+ {% block sidebar %}{% endblock %}
+ <br class="clear">
+ </div>
+ <!-- END Content -->
- <!-- Footer -->
- {% block footer %}
- <div id="footer">
- <p>
- The University Computer Club Inc.
- ABN: 98 843 368 069
- </p>
- <div class="linkslist">
- <a href="https://www.ucc.asn.au">main website</a>•
- <a href="https://wiki.ucc.asn.au">UCC wiki</a>•
- <a href="https://www.ucc.asn.au/aboutucc/contact.ucc">contact us</a>•
- <a href="https://gitlab.ucc.asn.au/frekk/uccportal">source code</a>
- </div>
- </div>
- {% endblock %}
- <!-- END Footer -->
+ <!-- Footer -->
+ {% block footer %}
+ <div id="footer">
+ <p>
+ The University Computer Club Inc.
+ ABN: 98 843 368 069
+ </p>
+ <div class="linkslist">
+ <a href="https://www.ucc.asn.au">main website</a>•
+ <a href="https://wiki.ucc.asn.au">UCC wiki</a>•
+ <a href="https://www.ucc.asn.au/aboutucc/contact.ucc">contact us</a>•
+ <a href="https://gitlab.ucc.asn.au/frekk/uccportal">source code</a>
+ </div>
+ </div>
+ {% endblock %}
+ <!-- END Footer -->
+{% if DEPLOYMENT_ENV != "PROD" %}
+<div class="watermark">{{DEPLOYMENT_ENV}}</div>
+<style>
+ .watermark {
+ position: fixed;
+ transform: translate(-50%, -50%);
+ opacity: 0.3;
+ {% if DEPLOYMENT_ENV == "STAGE" %}
+ color: RED;
+ {% else %}
+ color: GREEN;
+ {% endif %}
+ font-size: 15em;
+ top: 50%;
+ left: 50%;
+ pointer-events: none;
+ }
+</style>
+{%endif %}
</div>
<!-- END Container -->