diff --git a/software/davstorage/common.cfg b/software/davstorage/common.cfg index 8c5b7cafc4d6951da252171883f00b7b209606b2..68e59923c5fba50cea7746776577ba378198ef13 100644 --- a/software/davstorage/common.cfg +++ b/software/davstorage/common.cfg @@ -87,7 +87,7 @@ mode = 0644 [instance-davstorage] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-davstorage.cfg -md5sum = 51277653d8c19c8316d520bc8db140c7 +md5sum = 19485b63b21496eb751e5ac5815487b4 output = ${buildout:directory}/template-davstorage.cfg mode = 0644 diff --git a/software/davstorage/instance-davstorage.cfg b/software/davstorage/instance-davstorage.cfg index 82dfd5d87ef7596685c3754380dd223fdc6cc362..c888bcafdd89241d736993155ea9612bbc2e3666 100644 --- a/software/davstorage/instance-davstorage.cfg +++ b/software/davstorage/instance-davstorage.cfg @@ -15,7 +15,6 @@ parts = postfix-users postfix-master-conf postfix-service - request-frontend eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} @@ -182,31 +181,6 @@ pid = $${directory:spool}/pid saved = $${directory:spool}/saved trace = $${directory:spool}/trace -# Request frontend -[request-frontend-ajaxupload] -<= slap-connection -recipe = slapos.cookbook:request -name = Frontend Ajax -# XXX We have hardcoded SR URL here. -software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg -slave = true -config = url https-only -config-https-only = true -config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/ -return = domain - -[request-frontend] -<= slap-connection -recipe = slapos.cookbook:request -name = Frontend Webdav -# XXX We have hardcoded SR URL here. -software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg -slave = true -config = url https-only -config-https-only = true -config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/ -return = domain - [copy-app] recipe = plone.recipe.command update-command = command @@ -276,10 +250,27 @@ output = $${directory:postfix-conf}/master.cf mode = 0644 md5sum = de33aa9ef530ef3c7661b914d2d1fbef -# XXX Vivien: promise not working for now -#[frontend-ajaxupload-promise] -#recipe = slapos.cookbook:check_url_available -#path = $${basedirectory:promises}/frontend-ajaxupload -#url = $${request-frontend-ajaxupload:connection-site_url} -#dash_path = ${dash:location}/bin/dash -#curl_path = ${curl:location}/bin/curl \ No newline at end of file +# Request frontend +[request-frontend-ajaxupload] +<= slap-connection +recipe = slapos.cookbook:request +name = Frontend Ajax +# XXX We have hardcoded SR URL here. +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg +slave = true +config = url https-only +config-https-only = true +config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/ +return = domain + +[request-frontend] +<= slap-connection +recipe = slapos.cookbook:request +name = Frontend Webdav +# XXX We have hardcoded SR URL here. +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg +slave = true +config = url https-only +config-https-only = true +config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/ +return = domain