Update BonjourGrid archive, Upgrade BonjourGrid-Client

component/condor/buildout.cfg

@@ -22,6 +22,6 @@ extends =
   
 [condor]
 recipe = hexagonit.recipe.download
-url = http://vlyiqq.bn1.livefilestore.com/y1pgszH4PxAqzxKedBynqiVqhoV7w9CPJ0KjdSpQ1Be5F-vgSjUxScqz6diWYYh12SJk8Ft6v5M9vcNeFo45s8xHg/condor-7.9.4-x86_64_Debian6-stripped.tar.gz?download&psid=1
+url = http://vlyiqq.bn1.livefilestore.com/y1pxoUE3lvArO7Pt8bwAP9Ze25QpRCauFIFgY6CcWK0xVo_iL2It6kX7LD_dKXmMTZ8rWpDbz5Clv_UW3LpR0zhOw/condor-7.9.4-x86_64_Debian6-stripped.tar.gz?download&psid=1
 md5sum = e7d96746fc9102ca4583f8cd5eb472e0
 strip-top-level-dir = true

software/boinc-client/instance-boinc.cfg

@@ -35,25 +35,25 @@ install-dir = $${basedirectory:boinc}
 home = $${buildout:directory}
 client-wrapper = $${basedirectory:services}/boinc_client
 cmd-wrapper = $${basedirectory:services}/boinc_cmd
-#specifie a cc_config.xml file to boinc client, use cconfig
 ip = $${slap-network-information:global-ipv6}
 passwd = $${boinc-passwd:passwd}
+#specifie a cc_config.xml file to boinc client, use cconfig
 cconfig =
 boinc-bin = ${boinc:location}/bin/boinc_client
 cmd-bin = ${boinc:location}/bin/boinccmd
-server-url = $${slap-parameter:project_url}
-key = $${slap-parameter:key}
+server-url = $${slap-parameter:boinc-project-url}
+key = $${slap-parameter:boinc-account-key}
 
 # Publish all instance parameters
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-project-url = $${slap-parameter:project_url}
-account-key = $${slap-parameter:key}
-remote-host = $${boinc-client:ip}
-rpc-port = $${boinc-client:rpc-port}
-rpc-passwd = $${boinc-passwd:passwd}
+boinc_project_url = $${slap-parameter:boinc-project-url}
+boinc_account_key = $${slap-parameter:boinc-account-key}
+remote_host = $${boinc-client:ip}
+rpc_port = $${boinc-client:rpc-port}
+rpc_passwd = $${boinc-passwd:passwd}
 
 [slap-parameter]
 #please provide project_url and your session key via SlapOS Master (instance parameters)
-project_url = 
-key = 
+boinc-project-url = 
+boinc-account-key = 

software/boinc-client/software.cfg

@@ -28,7 +28,7 @@ mode = 0644
 # Default template for boinc-client instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
-md5sum = 359c2dcf415af3428736d31e5a0a30b1
+md5sum = 4a50c02252792d11b99d88206bc49e12
 output = ${buildout:directory}/template-boinc.cfg
 mode = 0644
 

software/bonjourgrid-client/bonjourgrid-instance.cfg

@@ -32,7 +32,7 @@ bytes = 8
 [computerinfo-script]
 recipe = slapos.recipe.template
 url = ${computer-info:location}/${computer-info:filename}
-output = $${bonjourgrid-client:work_dir}/machineinfo.sh
+output = $${bonjourgrid-client:work_dir}/machineinfo.worker.sh
 mode = 0744
 
 ip_address = $${slap-network-information:global-ipv6}

software/bonjourgrid-client/condor-instance.cfg

@@ -73,4 +73,4 @@ condor_host = $${condor:condor_host}
 condor_host = [$${slap-network-information:global-ipv6}]
 condor_collector_name = SLAPOS-CONDOR-POOL
 condor_diskspace = 5
-condor_allowed-write = $${:condor_host}
+condor_allowed-write = $${:condor_host}
\ No newline at end of file

software/bonjourgrid-client/software.cfg

@@ -8,12 +8,12 @@ parts=
   slapos-cookbook
   boinc
   condor
+  computer-info
   bonjourgrid
   template
   template-boinc
   template-condor
   template-bonjourgrid
-  computer-info
   slapos.cookbook-repository
   check-recipe
 
@@ -28,19 +28,12 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/bonjourgrid-instance.cfg
 output = ${buildout:directory}/template-bonjourgrid.cfg
 mode = 0644
-md5sum = 79906aff35d05227d177a7e18880e3c0
+md5sum = 4cf5a1a44bc7185f8882ab7247f309fc
 
 [bonjourgrid]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.tar.gz
-md5sum = 50f6da04e9cd203a886a9cb4658f8e03
-
-[computer-info]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/templates/machineinfo.worker.sh.in
-md5sum = 3fd602fdf8a4fd30a247752c7c03031a
-filename = machineinfo.worker.sh.in
-download-only = true
+url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.slapos.tar.gz
+md5sum = 5b4594b8451d83eedfa5224dbdcbb872
 
 [template]
 # Default template for boinc-client instance.
@@ -50,6 +43,13 @@ md5sum = 1fad063b948b00be92cbd4d6b1bb8c10
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
+[computer-info]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/machineinfo.worker.sh.in
+md5sum = 994fcb4dff1c86755b27f7c4a085e24a
+filename = machineinfo.worker.sh.in
+download-only = true
+
 [template-boinc]
 # Default template for boinc-client instance.
 recipe = slapos.recipe.template
@@ -62,7 +62,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/condor-instance.cfg
 output = ${buildout:directory}/template-condor.cfg
-md5sum = 26d147295a10807efc9fa8256c4264f8
+md5sum = c314c3a338e5f5fa7862cf2ff14bef1b
 mode = 0644
 
 # Local development

software/bonjourgrid-client/templates/machineinfo.worker.sh.in

@@ -11,4 +11,4 @@ Ip=${:ip_address}
 
 c="{'"MHZ"':\"$Mhz\",'"Ram"':\"$Ram\",'"Cpu"':\"$Cpu\",'"HOST"':\"$H\",'"IP"':\"$Ip\"}"
 filename=`hostname`
-echo $c > $filename
+echo $c > $filename
\ No newline at end of file

software/bonjourgrid/software.cfg

@@ -51,7 +51,7 @@ md5sum = 59cc789d6ce765d3d25f9bd6f9659e55
 [bonjourgrid]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/bonjourgrid.src/bonjourgrid.slapos.tar.gz
-md5sum = e31b753e5e839355994c548869c0c043
+md5sum = 5b4594b8451d83eedfa5224dbdcbb872
 
 #################################
 ### Redis-Server description ####