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
Yusei Tahara
slapos
Commits
39c6448c
Commit
39c6448c
authored
Feb 15, 2017
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/varnish: Fix instanciation when web-checker is enabled.
parent
834645b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
software/varnish/instance-varnish.cfg.in
software/varnish/instance-varnish.cfg.in
+3
-4
software/varnish/software.cfg
software/varnish/software.cfg
+1
-1
No files found.
software/varnish/instance-varnish.cfg.in
View file @
39c6448c
{% set tcpv4_port = slapparameter_dict.get('tcpv4_port', 6001) -%}
{% set tcpv4_port = slapparameter_dict.get('tcpv4_port', 6001) -%}
{% set ip = (ipv4_set | list)[0] %}
{% set ip = (ipv4_set | list)[0] %}
[buildout]
[buildout]
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
parts =
parts =
publish-varnish-connection-information
publish-varnish-connection-information
varnish-instance
varnish-instance
...
@@ -46,10 +49,6 @@ notifempty = true
...
@@ -46,10 +49,6 @@ notifempty = true
create = true
create = true
{%- endif %}
{%- endif %}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[publish-varnish-connection-information]
[publish-varnish-connection-information]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
...
...
software/varnish/software.cfg
View file @
39c6448c
...
@@ -62,7 +62,7 @@ extra-context =
...
@@ -62,7 +62,7 @@ extra-context =
[template-varnish]
[template-varnish]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-varnish.cfg.in
url = ${:_profile_base_location_}/instance-varnish.cfg.in
md5sum =
4334d900f212d170fd0ca35865879bdf
md5sum =
0ea12a4ad2d2e3d406476e35b8d3e3fb
mode = 640
mode = 640
[versions]
[versions]
...
...
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