slapos/software/django : Software/Instance modified

software/django/buildout.hash.cfg

 [instance]
 filename = instance.cfg.in
-md5sum = f1330409045e5c7abb716d9e1eb1352f
+md5sum = 8ddb59ae08be7413518f28781cd2fd58

software/django/instance.cfg.in

@@ -12,13 +12,37 @@ etc = ${:home}/etc
 var = ${:home}/var
 srv = ${:home}/srv
 
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
 [setup-script]
 recipe = slapos.recipe.template:jinja2
 rendered = ${directory:home}/setup-script
 template =
   inline:#!/bin/sh
   export PATH={{ buildout['bin-directory'] }}:$PATH
+  export PYTHONSTARTUP={{ django_interpreter }}
+  export PYTHONPATH=`${setup-django:rendered}`:{{ buildout['bin-directory'] }}:$PYTHONPATH
+
+[setup-django]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:home}/setup-django.py
+template =
+  inline:#!{{ django_interpreter }}
+  import sys
+  import os
+  path = []
+  for p in sys.path:
+    if not os.path.relpath(p, start='{{ buildout['eggs-directory'] }}').startswith(os.pardir):
+      path.append(p)
+  print(":".join(path))
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-setup = ${setup-script:rendered}
+setup-script = ${setup-script:rendered}
+ipv6 = ${slap-configuration:ipv6-random}

software/django/software.cfg

@@ -13,7 +13,7 @@ part = python3
 
 [django]
 recipe = zc.recipe.egg
-interpreter = python_with_django
+interpreter = python_django
 eggs =
   Django
 
@@ -24,6 +24,7 @@ rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
 context =
   section buildout buildout
+  raw django_interpreter ${buildout:bin-directory}/${django:interpreter}
 
 [versions]
 Django = 3.2.12