Update Boinc server software and recipe

slapos/recipe/boinc/__init__.py

@@ -173,10 +173,13 @@ class Recipe(GenericBaseRecipe):
 
     #After make_project run configure_script to perform and restart apache php services
     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):
       os.unlink(service_status)
     parameter = dict(
-        readme=os.path.join(self.installroot, self.project+'.readme'),
+        readme=readme_file,
         htpasswd=self.htpasswd,
         installroot=self.installroot,
         username=slapuser,

slapos/recipe/boinc/configure.py

@@ -226,15 +226,16 @@ def create_wu(args, env):
   count = int(args['wu_number'])
   launch_args = [os.path.join(args['installroot'], 'bin/create_work'),
         '--appname', args['appname'], '--wu_name', args['wu_name'],
-        '--wu_template', os.path.join(args['templates'], args['appname'] + '_wu'),
-        '--result_template', os.path.join(args['templates'], args['appname'] + '_result'),
-        args['inputfile']]
-  for i in range(count - 1):
-    print "Creating project wroker num %s..." % args['wu_number']
+        '--wu_template', "templates/"+args['appname'] + '_wu',
+        '--result_template', "templates/"+args['appname'] + '_result',
+        args['appname']+'_input']
+  for i in range(count):
+    print "Creating project wroker %s..." % str(i+1)
     launch_args[4] = args['wu_name']+str(i+1)
     process = subprocess.Popen(launch_args, stdout=subprocess.PIPE,
               stderr=subprocess.STDOUT, env=env,
               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

software/boinc/software.cfg

@@ -47,8 +47,9 @@ wu-name = simpletest
 wu-number = 1
 
 [template-base]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.download
 download-only = true
+mode = 0644
 
 [template_result]
 <= template-base

stack/boinc/instance-boinc.cfg

@@ -71,7 +71,7 @@ stunnel-binary = ${stunnel:location}/bin/stunnel
 remote-host = $${mariadb-urlparse:host}
 remote-port = $${mariadb-urlparse:port}
 local-host = $${slap-network-information:local-ipv4}
-local-port = 33060
+local-port = 3306
 log-file = $${basedirectory:log}/stunnel.log
 config-file = $${directory:stunnel-conf}/stunnel.conf
 key-file = $${directory:stunnel-conf}/stunnel.key