From de4541a6752cf9073e2a20f102a1cb250a4e5c38 Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Thu, 12 Jun 2014 14:41:51 +0200
Subject: [PATCH] abilian: provide INSTANCE_HOST from config, not from envvar
---
software/abilian/extranet_spr/instance-environment.cfg.in | 2 --
software/abilian/extranet_spr/instance.cfg.in | 1 +
software/abilian/extranet_spr/software.cfg | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/software/abilian/extranet_spr/instance-environment.cfg.in b/software/abilian/extranet_spr/instance-environment.cfg.in
index b9b773033..f040b4668 100644
--- a/software/abilian/extranet_spr/instance-environment.cfg.in
+++ b/software/abilian/extranet_spr/instance-environment.cfg.in
@@ -11,7 +11,6 @@ PGHOST=$${:PGDATA}
PGUSER=postgres
ABILIAN_CONFIG=${abilian-config:location}/${abilian-config:filename}
EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance}
-EXTRANET_INSTANCE_HOST=$${instance-parameters:ipv6-random}
ABILIAN_CONFIG_EXTRA_PYTHON=$${config-production-py:rendered}
ABILIAN_CONFIG_EXTRA_JSON=$${json-extra-configuration:json-output}:$${buildout:directory}/partition-parameters.json
LD_LIBRARY_PATH=${cairo:location}/lib:${glib:location}/lib:${pango:location}/lib:${cups:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib
@@ -29,7 +28,6 @@ inline =
export PGUSER=$${instance-environment:PGUSER}
export ABILIAN_CONFIG=$${instance-environment:ABILIAN_CONFIG}
export EXTRANET_INSTANCE_PATH=$${instance-environment:EXTRANET_INSTANCE_PATH}
- export EXTRANET_INSTANCE_HOST=$${instance-environment:EXTRANET_INSTANCE_HOST}
export ABILIAN_CONFIG_EXTRA_PYTHON=$${instance-environment:ABILIAN_CONFIG_EXTRA_PYTHON}
export ABILIAN_CONFIG_EXTRA_JSON=$${instance-environment:ABILIAN_CONFIG_EXTRA_JSON}
export LD_LIBRARY_PATH=$${instance-environment:LD_LIBRARY_PATH}
diff --git a/software/abilian/extranet_spr/instance.cfg.in b/software/abilian/extranet_spr/instance.cfg.in
index ca0461de2..66a34eca2 100644
--- a/software/abilian/extranet_spr/instance.cfg.in
+++ b/software/abilian/extranet_spr/instance.cfg.in
@@ -48,6 +48,7 @@ UNOCONV_LOCATION = ${unoconv-repository:location}/unoconv
BROKER_URL = redis://:$${redis-requirepass:passwd}@[$${redis:ipv6}]:$${redis:port}/2
CELERY_RESULT_BACKEND = redis://:$${redis-requirepass:passwd}@[$${redis:ipv6}]:$${redis:port}/2
SECRET_KEY = $${csrf-secret-key:passwd}
+INSTANCE_HOST = $${instance-parameters:ipv6-random}
diff --git a/software/abilian/extranet_spr/software.cfg b/software/abilian/extranet_spr/software.cfg
index 37f8b8194..26c69806d 100644
--- a/software/abilian/extranet_spr/software.cfg
+++ b/software/abilian/extranet_spr/software.cfg
@@ -229,7 +229,7 @@ configure-command =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
-md5sum = 1bdd81a7c22a3cd1a28b8c1b06837b96
+md5sum = 23167d761e13d9eb41e381beecfc7664
mode = 0644
[instance-postgres]
@@ -257,7 +257,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-environment.cfg.in
output = ${buildout:directory}/instance-environment.cfg
-md5sum = a595fecd06cd4d4f806fddb7f686e8db
+md5sum = 747242345673e3b241b50bab5609294b
mode = 0644
--
2.30.9