Update BOINC configuration files

slapos/recipe/boinc/template/sed_update.in

@@ -11,5 +11,6 @@ sed -i.old -e "/<\/boinc>/i\<app>\n<name>$1</name>\n<user_friendly_name>$1</user
 sed -i.old -e "/<\/daemons>/i\<daemon>\n<cmd>\nsample_bitwise_validator -d 3 -app $1\n</cmd>\n</daemon>" $2/config.xml
 sed -i.old -e "/<\/daemons>/i\<daemon>\n<cmd>\nsample_assimilator -d 3 -app $1\n</cmd>\n</daemon>" $2/config.xml
 sed -i.old -e "/<\/config>/i\<uldl_pid>%(uldl_pid)s</uldl_pid>" $2/config.xml
+sed -i.old -e "/<\/config>/i\<httpd_user>%(user)s</httpd_user>" $2/config.xml
 
 fi
\ No newline at end of file

stack/boinc/buildout.cfg

@@ -41,7 +41,7 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
 output = ${buildout:directory}/template-boinc.cfg
-md5sum = 9577be00e3b42f16c0b20d66c3009e87
+md5sum = b85d32e9509e960459c2ba1e47741838
 mode = 0644
 
 #Template for deploying MySQL Database Server

stack/boinc/instance-boinc.cfg

@@ -170,7 +170,6 @@ environment-section =
 template = 
 configuration = 
 
-#Create password recovery code for slaprunner
 [boinc-passwd]
 recipe = slapos.cookbook:generate.password
 storage-path = $${rootdirectory:etc}/.boincpasswd

stack/boinc/template/apache.in

@@ -8,7 +8,7 @@ PHPINIDir ${:php_ini_dir}
 ServerAdmin someone@email
 DefaultType text/plain
 TypesConfig conf/mime.types
-ScriptSock = ${:cgid_sock}
+ScriptSock ${:cgid_sock}
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
 AddType application/x-httpd-php .php .phtml .php5 .php4