From 82fbdd2ca19476567d887f1edeffd94d5940de94 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 27 May 2020 11:26:52 +0100 Subject: [PATCH] deploy: Add allowed hosts to Ansible variables Move DB credentials to inventory file --- playbook.yml | 2 -- roles/webserver/templates/settings.j2 | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/playbook.yml b/playbook.yml index 00f763d..815ee4d 100644 --- a/playbook.yml +++ b/playbook.yml @@ -16,5 +16,3 @@ vars: ansible_python_interpreter: python2 - db_user: 'breccia' - db_pass: 'breccia' diff --git a/roles/webserver/templates/settings.j2 b/roles/webserver/templates/settings.j2 index 4f45b14..f99d88e 100644 --- a/roles/webserver/templates/settings.j2 +++ b/roles/webserver/templates/settings.j2 @@ -3,9 +3,14 @@ SECRET_KEY={{ secret_key }} 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 }} +{% if allowed_hosts is defined %} +ALLOWED_HOSTS={% for h in allowed_hosts %}{{ h }},{% endfor %} +{% else %} +ALLOWED_HOSTS={{ inventory_hostname }},localhost,127.0.0.1 +{% endif %} + PROJECT_SHORT_NAME={{ display_short_name }} PROJECT_LONG_NAME={{ display_long_name }}