From 7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 1 Aug 2016 19:32:53 +0100 Subject: toaster: checksettings call django's loaddata instead of custom command Call django's inbuilt loaddata command to load the appropriate fixtures. We also attempt to load a fixture called "custom" and fail silently if we don't have one. This is where initial customisations can be done to load particular settings or data into Toaster (for example layers or default values for variables) Make sure the value for TEMPLATECONF is available to checksettings so that we can have a go a working out which default data to load. Signed-off-by: Michael Wood --- bin/toaster | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/toaster b/bin/toaster index 79ab301de..80d07ab0c 100755 --- a/bin/toaster +++ b/bin/toaster @@ -59,7 +59,8 @@ webserverStartAll() echo "Failed migrations, aborting system start" 1>&2 return $retval fi - + # Make sure that checksettings can pick up any value for TEMPLATECONF + export TEMPLATECONF $MANAGE checksettings --traceback || retval=1 if [ $retval -eq 1 ]; then -- cgit 1.2.3-korg