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
Eteri
slapos
Commits
a844ffd0
Commit
a844ffd0
authored
Nov 13, 2017
by
Eteri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: add bind to a specific ip
parent
ddc44378
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
38 deletions
+4
-38
stack/caddy/Caddyfile.in
stack/caddy/Caddyfile.in
+0
-31
stack/caddy/buildout.cfg
stack/caddy/buildout.cfg
+2
-2
stack/caddy/instance-caddy.cfg.in
stack/caddy/instance-caddy.cfg.in
+2
-5
No files found.
stack/caddy/Caddyfile.in
View file @
a844ffd0
...
@@ -19,22 +19,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
...
@@ -19,22 +19,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %}
{%- endif %}
{% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['zope'] == 'true' -%}
proxy / {{parameter_dict['url']}}/VirtualHostBase/https/{{ parameter_dict['domain'] }}/VirtualHostRoot/ {
insecure_skip_verify
}
{% else %}
proxy / {{parameter_dict['url']}}
{%- endif %}
{%- endif %}
bind {{caddy_configuration_dict['ipv6']}}
bind {{caddy_configuration_dict['ipv6']}}
}
}
...
@@ -59,21 +43,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
...
@@ -59,21 +43,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %}
{%- endif %}
{% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['zope'] == 'true' -%}
proxy / {{parameter_dict['url']}}/VirtualHostBase/https/[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port-ipv6']}}/VirtualHostRoot/ {
insecure_skip_verify
}
{% else %}
proxy / {{parameter_dict['url']}}
{%- endif %}
{%- endif %}
bind {{caddy_configuration_dict['ipv6']}}
bind {{caddy_configuration_dict['ipv6']}}
}
}
...
...
stack/caddy/buildout.cfg
View file @
a844ffd0
...
@@ -27,7 +27,7 @@ mode = 0644
...
@@ -27,7 +27,7 @@ mode = 0644
[template-caddyfile]
[template-caddyfile]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/Caddyfile.in
url = ${:_profile_base_location_}/Caddyfile.in
md5sum =
991eb3cc2fe46bd6bfb77e2db9cb378f
md5sum =
6f3bef122ac60fdbeff156eae92b206c
filename = Caddyfile.in
filename = Caddyfile.in
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 0644
mode = 0644
...
@@ -35,7 +35,7 @@ mode = 0644
...
@@ -35,7 +35,7 @@ mode = 0644
[template-caddy]
[template-caddy]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy.cfg.in
url = ${:_profile_base_location_}/instance-caddy.cfg.in
md5sum =
4a8f049778640556d52a9de98f7eb987
md5sum =
3b796dee5c509393fd396fd019914a2e
output = ${buildout:directory}/instance-caddy.cfg.in
output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644
mode = 0644
...
...
stack/caddy/instance-caddy.cfg.in
View file @
a844ffd0
...
@@ -119,7 +119,7 @@ user = $${slap-parameter:username}
...
@@ -119,7 +119,7 @@ user = $${slap-parameter:username}
secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
[slap-parameter]
[slap-parameter]
domain =
caddy-test.erp5.net:9443
domain =
key-content =
key-content =
cert-content =
cert-content =
caddy-ca-certificate =
caddy-ca-certificate =
...
@@ -128,7 +128,4 @@ port-ipv4 = 4443
...
@@ -128,7 +128,4 @@ port-ipv4 = 4443
enable-quic = true
enable-quic = true
enable-basic-auth =
enable-basic-auth =
username = admin
username = admin
password = $${htpasswd:passwd}
password = $${htpasswd:passwd}
proxy = true
\ No newline at end of file
zope = true
url = https://[2001:67c:1254:72::5d03]:2151
\ No newline at end of file
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