Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
e91d7f38
Commit
e91d7f38
authored
Jun 22, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use system curl.
parent
4bb3e4f9
Changes
6
Show 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):
...
@@ -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
...
...
slapos/recipe/check_url_available/template/check_url.in
View file @
e91d7f38
...
@@ -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
...
...
software/kvm/instance-kvm.cfg
View file @
e91d7f38
...
@@ -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
software/kvm/software.cfg
View file @
e91d7f38
...
@@ -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 =
...
...
stack/lamp/buildout.cfg
View file @
e91d7f38
...
@@ -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
...
...
stack/lamp/instance-apache-php.cfg
View file @
e91d7f38
...
@@ -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]
...
...
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