Commit 0cde3c63 authored by Alain Takoudjou's avatar Alain Takoudjou

Update Boinc according to previous merge

parent a8c6cb9c
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
develop = develop =
${:parts-directory}/slapos.cookbook-repository ${:parts-directory}/slapos.cookbook-repository
parts = parts =
slapos-cookbook slapos-cookbook
subversion subversion
apache-php apache-php
instance instance
instance-apache instance-apache
instance-mariadb instance-mariadb
template-httpd-conf template-httpd-conf
...@@ -27,6 +27,7 @@ extends = ...@@ -27,6 +27,7 @@ extends =
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/stunnel/buildout.cfg ../../component/stunnel/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/git/buildout.cfg
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
...@@ -57,7 +58,7 @@ strip-top-level-dir = true ...@@ -57,7 +58,7 @@ strip-top-level-dir = true
[website] [website]
recipe = z3c.recipe.mkdir recipe = z3c.recipe.mkdir
paths = paths =
${application:location}/data/files/website ${application:location}/data/files/website
${application:location}/data/files/website2 ${application:location}/data/files/website2
...@@ -200,7 +201,7 @@ signature-certificate-list = ...@@ -200,7 +201,7 @@ signature-certificate-list =
5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e 5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI= x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-----END CERTIFICATE----- -----END CERTIFICATE-----
[versions] [versions]
#Error: Couldn't install: lxml 3.1.2 #Error: Couldn't install: lxml 3.1.2
lxml = 3.1.1 lxml = 3.1.1
......
...@@ -34,7 +34,7 @@ eggs = ...@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg output = ${buildout:directory}/template-boinc.cfg
md5sum = 58aa7bbc2d088feb2c164468b9b2c85a md5sum = ead728e74a7fe58ef9b39397f2354f77
mode = 0644 mode = 0644
#Template for deploying MySQL Database Server #Template for deploying MySQL Database Server
......
...@@ -344,7 +344,7 @@ curl_path = ${curl:location}/bin/curl ...@@ -344,7 +344,7 @@ curl_path = ${curl:location}/bin/curl
recipe = slapos.cookbook:check_page_content recipe = slapos.cookbook:check_page_content
path = $${basedirectory:promises}/content path = $${basedirectory:promises}/content
url = $${request-frontend:connection-site_url}/$${slap-parameter:project} url = $${request-frontend:connection-site_url}/$${slap-parameter:project}
pattern = $${slap-parameter:full-name} match = $${slap-parameter:full-name}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
......
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