Commit e91d7f38 authored by Romain Courteaud's avatar Romain Courteaud

Do not use system curl.

parent 4bb3e4f9
...@@ -36,6 +36,7 @@ class Recipe(GenericBaseRecipe): ...@@ -36,6 +36,7 @@ class Recipe(GenericBaseRecipe):
config = { config = {
'url': self.options['url'], 'url': self.options['url'],
'shell_path': self.options['dash_path'], 'shell_path': self.options['dash_path'],
'curl_path': self.options['curl_path'],
} }
# XXX-Cedric in this script, curl won't check certificate # XXX-Cedric in this script, curl won't check certificate
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# BEWARE: It will be overwritten automatically # BEWARE: It will be overwritten automatically
URL="%(url)s" URL="%(url)s"
CODE=$(curl -k -sL $URL -w %%{http_code} -o /dev/null) CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
if [ $CODE -eq 000 ]; then if [ $CODE -eq 000 ]; then
echo "$URL is not available (server not reachable)" >&2 echo "$URL is not available (server not reachable)" >&2
......
...@@ -157,3 +157,4 @@ recipe = slapos.cookbook:check_url_available ...@@ -157,3 +157,4 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend_promise path = $${basedirectory:promises}/frontend_promise
url = $${publish-kvm-frontend-connection-information:url} url = $${publish-kvm-frontend-connection-information:url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
...@@ -14,6 +14,7 @@ extends = ...@@ -14,6 +14,7 @@ extends =
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/curl/buildout.cfg
../../stack/nodejs.cfg ../../stack/nodejs.cfg
develop = develop =
......
...@@ -36,6 +36,7 @@ extends = ...@@ -36,6 +36,7 @@ extends =
../../component/dropbear/buildout.cfg ../../component/dropbear/buildout.cfg
../slapos.cfg ../slapos.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/curl/buildout.cfg
[mariadb] [mariadb]
# Compile dir is for plugins, there's no plugin in LAMP # Compile dir is for plugins, there's no plugin in LAMP
......
...@@ -254,6 +254,7 @@ recipe = slapos.cookbook:check_url_available ...@@ -254,6 +254,7 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend path = $${basedirectory:promises}/frontend
url = $${request-frontend:connection-site_url} url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
[slap-parameter] [slap-parameter]
......
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