From 440c06a50b99ca1633757c4df78f71fd1497781c Mon Sep 17 00:00:00 2001
From: plup <plup@plup.io>
Date: Mon, 25 May 2020 12:29:51 +0200
Subject: [PATCH] feature: added missing mandatory params in template config
---
djangoldp/conf/global_settings.py | 1 +
djangoldp/conf/server_template/config.yml | 12 ++++++++----
docs/testing_client.md | 7 +++++++
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/djangoldp/conf/global_settings.py b/djangoldp/conf/global_settings.py
index 58c7671f..c8f0dc9b 100644
--- a/djangoldp/conf/global_settings.py
+++ b/djangoldp/conf/global_settings.py
@@ -288,6 +288,7 @@ SECRET_KEY = ''
# Default server url
SITE_URL = 'http://localhost:8000/'
+BASE_URL = SITE_URL
# Default URL conf
ROOT_URLCONF = 'djangoldp.urls'
diff --git a/djangoldp/conf/server_template/config.yml b/djangoldp/conf/server_template/config.yml
index f9f9c21f..fe75e69a 100644
--- a/djangoldp/conf/server_template/config.yml
+++ b/djangoldp/conf/server_template/config.yml
@@ -1,16 +1,14 @@
dependencies:
- - git+https://git.startinblox.com/djangoldp-packages/djangoldp-account.git
ldppackages:
server:
- # App specific settings
- # Django required settings
+ # DjangoLDP required settings
DEBUG: true
ALLOWED_HOSTS:
- '*'
- SECRET_KEY: "{{secret_key}}"
+ SECRET_KEY: '{{secret_key}}'
DATABASES:
default:
ENGINE: django.db.backends.sqlite3
@@ -21,3 +19,9 @@ server:
PROSODY_HTTP_URL:
JABBER_DEFAULT_HOST:
ACCOUNT_ACTIVATION_DAYS: 10
+
+ # needs review (could be defined elsewhere)
+ ROOT_URLCONF: server.urls
+ USE_ETAGS: true
+ DEFAULT_CONTENT_TYPE: text/html
+ FILE_CHARSET: utf-8
diff --git a/docs/testing_client.md b/docs/testing_client.md
index 43332ca6..30c71a42 100644
--- a/docs/testing_client.md
+++ b/docs/testing_client.md
@@ -37,6 +37,13 @@ ldppackages:
# djangoldp runserver
```
+### Add a distribution dependency
+
+```
+dependencies:
+ - git+https://git.startinblox.com/djangoldp-packages/djangoldp-account.git
+```
+
## With PostgreSQL backend
```
--
GitLab