Commit b72e35b7 authored by Thomas Leymonerie's avatar Thomas Leymonerie

slapos/software/django: Delete part [directory] & add [] in publish info

parent e911c482
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8ddb59ae08be7413518f28781cd2fd58 md5sum = 16c31e51084f195f5a10afb530f55475
...@@ -5,13 +5,6 @@ parts = ...@@ -5,13 +5,6 @@ parts =
eggs-directory = {{ buildout['eggs-directory'] }} eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }} develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
[directory]
recipe = slapos.cookbook:mkdirectory
home = ${buildout:directory}
etc = ${:home}/etc
var = ${:home}/var
srv = ${:home}/srv
[slap-configuration] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id} computer = ${slap-connection:computer-id}
...@@ -22,7 +15,7 @@ cert = ${slap-connection:cert-file} ...@@ -22,7 +15,7 @@ cert = ${slap-connection:cert-file}
[setup-script] [setup-script]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = ${directory:home}/setup-script rendered = ${buildout:directory}/setup-script
template = template =
inline:#!/bin/sh inline:#!/bin/sh
export PATH={{ buildout['bin-directory'] }}:$PATH export PATH={{ buildout['bin-directory'] }}:$PATH
...@@ -31,7 +24,7 @@ template = ...@@ -31,7 +24,7 @@ template =
[setup-django] [setup-django]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = ${directory:home}/setup-django.py rendered = ${buildout:directory}/setup-django.py
template = template =
inline:#!{{ django_interpreter }} inline:#!{{ django_interpreter }}
import sys import sys
...@@ -45,4 +38,4 @@ template = ...@@ -45,4 +38,4 @@ template =
[publish-connection-information] [publish-connection-information]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
setup-script = ${setup-script:rendered} setup-script = ${setup-script:rendered}
ipv6 = ${slap-configuration:ipv6-random} ipv6 = [${slap-configuration:ipv6-random}]
...@@ -17,7 +17,6 @@ interpreter = python_django ...@@ -17,7 +17,6 @@ interpreter = python_django
eggs = eggs =
Django Django
[instance] [instance]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = ${buildout:directory}/template.cfg rendered = ${buildout:directory}/template.cfg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment