From 2998a7e3fbd566e2e4cc7d0f27bfa539917ede60 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 16 Dec 2020 15:35:00 +0000 Subject: [PATCH] deploy: entry for google maps api key --- people/models/relationship.py | 2 +- roles/defaults/main.yml | 4 ++++ roles/webserver/defaults/main.yml | 2 ++ roles/webserver/templates/settings.j2 | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 roles/defaults/main.yml diff --git a/people/models/relationship.py b/people/models/relationship.py index 83346ea..f6cdbe0 100644 --- a/people/models/relationship.py +++ b/people/models/relationship.py @@ -52,7 +52,7 @@ class Relationship(models.Model): class Meta: constraints = [ - models.UniqueConstraint(fields=['source', 'person'], + models.UniqueConstraint(fields=['source', 'target'], name='unique_relationship'), ] diff --git a/roles/defaults/main.yml b/roles/defaults/main.yml new file mode 100644 index 0000000..bf12883 --- /dev/null +++ b/roles/defaults/main.yml @@ -0,0 +1,4 @@ +--- +db_name: 'breccia' +db_user: 'breccia' +db_pass: 'breccia' diff --git a/roles/webserver/defaults/main.yml b/roles/webserver/defaults/main.yml index 5d9fbcf..bc0d0af 100644 --- a/roles/webserver/defaults/main.yml +++ b/roles/webserver/defaults/main.yml @@ -14,6 +14,8 @@ venv_dir: '{{ project_dir }}/venv' web_user: nginx web_group: nginx db_name: '{{ project_name }}' +db_user: 'breccia' +db_pass: 'breccia' 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 f99d88e..e9ccb89 100644 --- a/roles/webserver/templates/settings.j2 +++ b/roles/webserver/templates/settings.j2 @@ -23,3 +23,7 @@ DEFAULT_FROM_EMAIL={{ default_from_email }} {% if email_port is defined %} EMAIL_PORT={{ email_port }} {% endif %} + +{% if google_maps_api_key is defined %} +GOOGLE_MAPS_API_KEY={{ google_maps_api_key }} +{% endif %}