From 55484208ea25d16803aca5e06526840b9149473f Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <talino@tiolive.com>
Date: Wed, 19 Dec 2012 15:11:22 +0100
Subject: [PATCH] Use instance_guid in request frontend
---
stack/boinc/buildout.cfg | 2 +-
stack/boinc/instance-boinc.cfg | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/stack/boinc/buildout.cfg b/stack/boinc/buildout.cfg
index 72b572d93..3368c791f 100644
--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
-md5sum = 22de71bad135ab3c760c63e537dcb182
+md5sum = 88cb9251d54a05b69b9e7bfa9f07fef4
mode = 0644
#Template for deploying MySQL Database Server
diff --git a/stack/boinc/instance-boinc.cfg b/stack/boinc/instance-boinc.cfg
index 96ffbb8c4..26c5db7db 100644
--- a/stack/boinc/instance-boinc.cfg
+++ b/stack/boinc/instance-boinc.cfg
@@ -305,10 +305,11 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
-config = url custom_domain
+config = url custom_domain instance_guid
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
+config-instance_guid = $${slap-parameter:instance_guid}
# Deploy slapmonitor
@@ -385,6 +386,7 @@ wu-number =
input-file =
# Default value if no domain is specified
domain =
+instance_guid = SOFTINST-3
# Default value if no ssh parameter is specified
logbox-ip =
logbox-port =
--
2.30.9