From e410d9bcb1eb3f335f58d6e7756e87eb7fa1034c Mon Sep 17 00:00:00 2001 From: James Graham Date: Fri, 28 Feb 2020 15:44:43 +0000 Subject: [PATCH] fix: Add missing settings to template --- roles/webserver/defaults/main.yml | 5 ++++- roles/webserver/templates/settings.j2 | 12 ++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/roles/webserver/defaults/main.yml b/roles/webserver/defaults/main.yml index b016ee1..cfb895e 100644 --- a/roles/webserver/defaults/main.yml +++ b/roles/webserver/defaults/main.yml @@ -13,4 +13,7 @@ project_dir: '/var/www/{{ project_name }}' venv_dir: '{{ project_dir }}/venv' web_user: nginx web_group: nginx -db_name: '{{ project_name }}' \ No newline at end of file +db_name: '{{ project_name }}' + +display_short_name: 'BRECcIA' +display_long_name: 'BRECcIA Mapper' \ No newline at end of file diff --git a/roles/webserver/templates/settings.j2 b/roles/webserver/templates/settings.j2 index 4eea8af..16c4d77 100644 --- a/roles/webserver/templates/settings.j2 +++ b/roles/webserver/templates/settings.j2 @@ -6,13 +6,5 @@ DEBUG={{ "True" if deploy_mode > 1 else "False" }} ALLOWED_HOSTS={{ inventory_hostname }},localhost,127.0.0.1 DATABASE_URL=mysql://{{ db_user }}:{{ db_pass }}@localhost:3306/{{ db_name }} -# LDAP auth -AUTH_LDAP_SERVER_URI={{ ldap_server }} -AUTH_LDAP_USER_SEARCH={{ ldap_user_search }} -AUTH_LDAP_GROUP_SEARCH={{ ldap_group_search }} - -# PURE settings -PURE_URL={{ pure_api_url }} -PURE_API_KEY={{ pure_api_key }} -PURE_USERNAME={{ pure_api_user }} -PURE_PASSWORD={{ pure_api_pass }} +PROJECT_SHORT_NAME={{ display_short_name }} +PROJECT_LONG_NAME={{ display_long_name }}