Commit 851c5507 authored by Alain Takoudjou's avatar Alain Takoudjou

Update Boinc server software and recipe

parent 2095d014
...@@ -173,10 +173,13 @@ class Recipe(GenericBaseRecipe): ...@@ -173,10 +173,13 @@ class Recipe(GenericBaseRecipe):
#After make_project run configure_script to perform and restart apache php services #After make_project run configure_script to perform and restart apache php services
service_status = os.path.join(self.home, '.start_service') service_status = os.path.join(self.home, '.start_service')
readme_file = os.path.join(self.installroot, self.project+'.readme')
if os.path.exists(readme_file):
os.unlink(readme_file)
if os.path.exists(service_status): if os.path.exists(service_status):
os.unlink(service_status) os.unlink(service_status)
parameter = dict( parameter = dict(
readme=os.path.join(self.installroot, self.project+'.readme'), readme=readme_file,
htpasswd=self.htpasswd, htpasswd=self.htpasswd,
installroot=self.installroot, installroot=self.installroot,
username=slapuser, username=slapuser,
......
...@@ -226,15 +226,16 @@ def create_wu(args, env): ...@@ -226,15 +226,16 @@ def create_wu(args, env):
count = int(args['wu_number']) count = int(args['wu_number'])
launch_args = [os.path.join(args['installroot'], 'bin/create_work'), launch_args = [os.path.join(args['installroot'], 'bin/create_work'),
'--appname', args['appname'], '--wu_name', args['wu_name'], '--appname', args['appname'], '--wu_name', args['wu_name'],
'--wu_template', os.path.join(args['templates'], args['appname'] + '_wu'), '--wu_template', "templates/"+args['appname'] + '_wu',
'--result_template', os.path.join(args['templates'], args['appname'] + '_result'), '--result_template', "templates/"+args['appname'] + '_result',
args['inputfile']] args['appname']+'_input']
for i in range(count - 1): for i in range(count):
print "Creating project wroker num %s..." % args['wu_number'] print "Creating project wroker %s..." % str(i+1)
launch_args[4] = args['wu_name']+str(i+1) launch_args[4] = args['wu_name']+str(i+1)
process = subprocess.Popen(launch_args, stdout=subprocess.PIPE, process = subprocess.Popen(launch_args, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, env=env, stderr=subprocess.STDOUT, env=env,
cwd=args['installroot']) cwd=args['installroot'])
process.communicate()[0] result = process.communicate()[0]
print "Result for workunit num % \n%s" (str(i+1), result)
\ No newline at end of file
...@@ -47,8 +47,9 @@ wu-name = simpletest ...@@ -47,8 +47,9 @@ wu-name = simpletest
wu-number = 1 wu-number = 1
[template-base] [template-base]
recipe = hexagonit.recipe.download recipe = slapos.recipe.download
download-only = true download-only = true
mode = 0644
[template_result] [template_result]
<= template-base <= template-base
......
...@@ -71,7 +71,7 @@ stunnel-binary = ${stunnel:location}/bin/stunnel ...@@ -71,7 +71,7 @@ stunnel-binary = ${stunnel:location}/bin/stunnel
remote-host = $${mariadb-urlparse:host} remote-host = $${mariadb-urlparse:host}
remote-port = $${mariadb-urlparse:port} remote-port = $${mariadb-urlparse:port}
local-host = $${slap-network-information:local-ipv4} local-host = $${slap-network-information:local-ipv4}
local-port = 33060 local-port = 3306
log-file = $${basedirectory:log}/stunnel.log log-file = $${basedirectory:log}/stunnel.log
config-file = $${directory:stunnel-conf}/stunnel.conf config-file = $${directory:stunnel-conf}/stunnel.conf
key-file = $${directory:stunnel-conf}/stunnel.key key-file = $${directory:stunnel-conf}/stunnel.key
......
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