Use instance_guid in request frontend

55484208 · Alain Takoudjou · Cédric de Saint Martin · 4b48301f · 55484208 · 55484208
Commit 55484208 authored Dec 19, 2012 by Alain Takoudjou Committed by Cédric de Saint Martin Feb 11, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

stack/boinc/buildout.cfg stack/boinc/buildout.cfg +1 -1

stack/boinc/instance-boinc.cfg stack/boinc/instance-boinc.cfg +3 -1

No files found.
--- 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

--- 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 =