Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Yusei Tahara
slapos
Commits
e91d7f38
Commit
e91d7f38
authored
12 years ago
by
Romain Courteaud
Browse files
Options
Download
Email Patches
Plain Diff
Do not use system curl.
parent
4bb3e4f9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
1 deletion
+6
-1
slapos/recipe/check_url_available/__init__.py
slapos/recipe/check_url_available/__init__.py
+1
-0
slapos/recipe/check_url_available/template/check_url.in
slapos/recipe/check_url_available/template/check_url.in
+1
-1
software/kvm/instance-kvm.cfg
software/kvm/instance-kvm.cfg
+1
-0
software/kvm/software.cfg
software/kvm/software.cfg
+1
-0
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+1
-0
stack/lamp/instance-apache-php.cfg
stack/lamp/instance-apache-php.cfg
+1
-0
No files found.
slapos/recipe/check_url_available/__init__.py
View file @
e91d7f38
...
...
@@ -36,6 +36,7 @@ class Recipe(GenericBaseRecipe):
config
=
{
'url'
:
self
.
options
[
'url'
],
'shell_path'
:
self
.
options
[
'dash_path'
],
'curl_path'
:
self
.
options
[
'curl_path'
],
}
# XXX-Cedric in this script, curl won't check certificate
...
...
This diff is collapsed.
Click to expand it.
slapos/recipe/check_url_available/template/check_url.in
View file @
e91d7f38
...
...
@@ -3,7 +3,7 @@
# BEWARE: It will be overwritten automatically
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
echo "$URL is not available (server not reachable)" >&2
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-kvm.cfg
View file @
e91d7f38
...
...
@@ -157,3 +157,4 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend_promise
url = $${publish-kvm-frontend-connection-information:url}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
This diff is collapsed.
Click to expand it.
software/kvm/software.cfg
View file @
e91d7f38
...
...
@@ -14,6 +14,7 @@ extends =
../../component/openssl/buildout.cfg
../../component/dash/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/curl/buildout.cfg
../../stack/nodejs.cfg
develop =
...
...
This diff is collapsed.
Click to expand it.
stack/lamp/buildout.cfg
View file @
e91d7f38
...
...
@@ -36,6 +36,7 @@ extends =
../../component/dropbear/buildout.cfg
../slapos.cfg
../../component/dash/buildout.cfg
../../component/curl/buildout.cfg
[mariadb]
# Compile dir is for plugins, there's no plugin in LAMP
...
...
This diff is collapsed.
Click to expand it.
stack/lamp/instance-apache-php.cfg
View file @
e91d7f38
...
...
@@ -254,6 +254,7 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend
url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
[slap-parameter]
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment