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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
f0f126b2
Commit
f0f126b2
authored
Nov 03, 2017
by
Eteri
Committed by
Rafael Monnerat
Nov 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy: add ipv4
parent
b7d86865
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
stack/caddy/Caddyfile.in
stack/caddy/Caddyfile.in
+11
-1
stack/caddy/buildout.cfg
stack/caddy/buildout.cfg
+2
-2
stack/caddy/instance-caddy.cfg.in
stack/caddy/instance-caddy.cfg.in
+6
-4
No files found.
stack/caddy/Caddyfile.in
View file @
f0f126b2
...
@@ -22,7 +22,7 @@ basicauth / admin {{htpasswd_dict}}
...
@@ -22,7 +22,7 @@ basicauth / admin {{htpasswd_dict}}
{%- endif %}
{%- endif %}
[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}} {
[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port
-ipv6
']}} {
tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
...
@@ -37,3 +37,13 @@ basicauth / admin {{htpasswd_dict}}
...
@@ -37,3 +37,13 @@ basicauth / admin {{htpasswd_dict}}
basicauth / admin {{htpasswd_dict}}
basicauth / admin {{htpasswd_dict}}
}
}
[{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port-ipv4']}} {
log {{caddy_configuration_dict['access_log']}}
root {{ directory_dict['public_html'] }}
basicauth / admin {{htpasswd_dict}}
}
\ No newline at end of file
stack/caddy/buildout.cfg
View file @
f0f126b2
...
@@ -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 =
2580eeb504d93627d1990f42663f80c7
md5sum =
5de9738527f48bc5480eeb0ad97727a5
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 =
b684a143d5620e8ed89744ec8c7f079e
md5sum =
cee290eac3f9f8dbc614ac7373f412fc
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 @
f0f126b2
...
@@ -114,14 +114,16 @@ mode = 0600
...
@@ -114,14 +114,16 @@ mode = 0600
[publish-connection-information]
[publish-connection-information]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
init-password = $${htpasswd:passwd}
#init-password = $${htpasswd:passwd}
init-user = admin
#init-user = admin
url = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port}
url-ipv6 = https://admin:$${htpasswd:passwd}@[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
url-ipv4 = http://admin:$${htpasswd:passwd}@[$${caddy-configuration:local_ip}]:$${slap-parameter:port-ipv4}
[slap-parameter]
[slap-parameter]
domain =
domain =
key-content =
key-content =
cert-content =
cert-content =
caddy-ca-certificate =
caddy-ca-certificate =
port = 9443
port-ipv6 = 4443
port-ipv4 = 9443
enable-quic =
enable-quic =
\ 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