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
Jean-Paul Smets
slapos
Commits
f37df893
Commit
f37df893
authored
Jul 23, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make tcpv4-port configurable and add json schemas.
parent
c8d385fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
4 deletions
+46
-4
software/varnish/instance-varnish-input-schema.json
software/varnish/instance-varnish-input-schema.json
+30
-0
software/varnish/instance-varnish-output-schema.json
software/varnish/instance-varnish-output-schema.json
+11
-0
software/varnish/instance-varnish.cfg.in
software/varnish/instance-varnish.cfg.in
+5
-4
No files found.
software/varnish/instance-varnish-input-schema.json
0 → 100644
View file @
f37df893
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"extends"
:
"./schema-definitions.json#"
,
"properties"
:
{
"tcpv4-port"
:
{
"allOf"
:
[{
"$ref"
:
"#/definitions/tcpv4port"
},
{
"description"
:
"Start allocating ports at this value, going upward"
,
"default"
:
6001
}]
},
"backend-url"
:
{
"description"
:
"The backend url that varnish will cache"
,
"type"
:
"string"
},
"web-checker-frontend-url"
:
{
"description"
:
"The entry-point-url that web checker will check the HTTP headers of all links in the web site"
,
"type"
:
"string"
},
"web-checker-mail-address"
:
{
"description"
:
"Email address to which web checker result is sent"
,
"type"
:
"string"
},
"web-checker-smtp-host"
:
{
"description"
:
"The smtp server to be used to send the web checker result"
,
"type"
:
"string"
}
}
}
software/varnish/instance-varnish-output-schema.json
0 → 100644
View file @
f37df893
{
"$schema"
:
"http://json-schema.org/draft-04/schema#"
,
"description"
:
"Values returned by Varnish instanciation"
,
"properties"
:
{
"url"
:
{
"description"
:
"Varnish HTTP service access information"
,
"type"
:
"string"
}
},
"type"
:
"object"
}
software/varnish/instance-varnish.cfg.in
View file @
f37df893
{% set web_checker_parameter = slapparameter_dict['web-checker-mail-address'] -%}
{% set tcpv4_port = slapparameter_dict.get('tcpv4_port', 6001) | int -%}
[buildout]
parts =
publish-varnish-connection-information
...
...
@@ -17,7 +18,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[publish-varnish-connection-information]
recipe = slapos.cookbook:publish
url
recipe = slapos.cookbook:publish
.serialised
url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
[varnish-instance]
...
...
@@ -25,9 +26,9 @@ recipe = slapos.cookbook:generic.varnish
# Network options
ip = ${slap-network-information:local-ipv4}
server-port =
6001
manager-port =
6002
stunnel-port =
6003
server-port =
{{ tcpv4_port }}
manager-port =
{{ tcpv4_port + 1 }}
stunnel-port =
{{ tcpv4_port + 2}}
# Paths: Running wrappers
varnishd-wrapper = ${basedirectory:services}/varnishd
...
...
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