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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kasra Jamshidi
slapos
Commits
23921dfd
Commit
23921dfd
authored
Jul 12, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename backend url parameter name : tidstorage-url -> backend-url
still keepking backward compatibility.
parent
51ed5066
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
slapos/recipe/README.generic_varnish.txt
slapos/recipe/README.generic_varnish.txt
+2
-3
slapos/recipe/generic_varnish/__init__.py
slapos/recipe/generic_varnish/__init__.py
+4
-1
No files found.
slapos/recipe/README.generic_varnish.txt
View file @
23921dfd
...
@@ -12,15 +12,14 @@ On slap console, you can instanciate varnish like this:
...
@@ -12,15 +12,14 @@ On slap console, you can instanciate varnish like this:
instance = request(
instance = request(
software_type='varnish',
software_type='varnish',
partition_parameter_kw={
partition_parameter_kw={
'
tidstorage-url':'http://[your tidstrage address]:your tid strage
port',
'
backend-url':'https://[your_backend_address]:your_backend_
port',
'web-checker-frontend-url':'http://www.example.com',
'web-checker-frontend-url':'http://www.example.com',
'web-checker-mail-address':'web-checker-result@example.com',
'web-checker-mail-address':'web-checker-result@example.com',
'web-checker-smtp-host':'mail.example.com',
'web-checker-smtp-host':'mail.example.com',
}
}
)
)
tidstrage-url is the backend url that varnish will cache. It is expected that
backend-url is the backend url that varnish will cache.
the backend is created by tidstorage recipe.
web-checker-frontend-url is the entry-point-url that web checker will check
web-checker-frontend-url is the entry-point-url that web checker will check
the HTTP headers of all the pages in the web site.
the HTTP headers of all the pages in the web site.
...
...
slapos/recipe/generic_varnish/__init__.py
View file @
23921dfd
...
@@ -37,7 +37,10 @@ class Recipe(GenericSlapRecipe):
...
@@ -37,7 +37,10 @@ class Recipe(GenericSlapRecipe):
"""
"""
def
_install
(
self
):
def
_install
(
self
):
ip
=
self
.
options
[
'ip'
]
ip
=
self
.
options
[
'ip'
]
backend_url
=
self
.
parameter_dict
[
'tidstorage-url'
]
backend_url
=
self
.
parameter_dict
.
get
(
'backend-url'
,
self
.
parameter_dict
.
get
(
'tidstorage-url'
)
# BBB
)
backend_server
,
backend_port
=
self
.
_getBackendServer
(
backend_url
)
backend_server
,
backend_port
=
self
.
_getBackendServer
(
backend_url
)
path_list
=
[]
path_list
=
[]
if
backend_url
.
startswith
(
'https://'
):
if
backend_url
.
startswith
(
'https://'
):
...
...
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