Commit 8c3da9e6 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Create default vhost

It is dummy vhost for example.org
parent d2648882
...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e ...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
md5sum = 293498fe5c61a72baaf15f9287d36abb md5sum = c8ab203bec60416f13aabe3f4233de7f
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
...@@ -51,7 +51,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b ...@@ -51,7 +51,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-virtualhost] [template-default-virtualhost]
filename = templates/000.conf.in filename = templates/000.conf.in
md5sum = 3b5e20b48112a2cf070481966506d9bf md5sum = 4dbb8560e4de1af2a0706b020e713fe7
[template-default-slave-virtualhost] [template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in filename = templates/default-virtualhost.conf.in
......
...@@ -157,6 +157,11 @@ extensions = jinja2.ext.do ...@@ -157,6 +157,11 @@ extensions = jinja2.ext.do
extra-context = extra-context =
key http_port instance-parameter:configuration.plain_http_port key http_port instance-parameter:configuration.plain_http_port
key https_port instance-parameter:configuration.port key https_port instance-parameter:configuration.port
key login_certificate ca-frontend:cert-file
key login_key ca-frontend:key-file
key login_ca_crt ca-custom-frontend:rendered
key ipv4_addr instance-parameter:ipv4-random
key ipv6_addr instance-parameter:ipv6-random
[software-release-path] [software-release-path]
template-empty = ${template-empty:target} template-empty = ${template-empty:target}
......
# TODO-Caddy <VirtualHost *:{{ https_port }}> https://www.example.org:{{ https_port }} {
# TODO-Caddy ServerName www.example.org tls {{ login_certificate }} {{ login_key }}
bind {{ ipv4_addr }}
# TODO-Caddy bind {{ ipv6_addr }}
status 404 /
# TODO-Caddy SSLEngine on # TODO-Caddy SSLEngine on
# TODO-Caddy SSLProxyEngine on # TODO-Caddy SSLProxyEngine on
# TODO-Caddy SSLProtocol all -SSLv2 -SSLv3 # TODO-Caddy SSLProtocol all -SSLv2 -SSLv3
...@@ -13,10 +16,10 @@ ...@@ -13,10 +16,10 @@
# TODO-Caddy # TODO-Caddy
# TODO-Caddy ErrorDocument 404 /notfound.html # TODO-Caddy ErrorDocument 404 /notfound.html
# TODO-Caddy # TODO-Caddy
# TODO-Caddy </VirtualHost> }
# TODO-Caddy
# TODO-Caddy <VirtualHost *:{{ http_port }}> http://www.example.org:{{ http_port }} {
# TODO-Caddy bind {{ ipv4_addr }}
# TODO-Caddy ServerName www.example.org # TODO-Caddy bind {{ ipv6_addr }}
# TODO-Caddy ErrorDocument 404 /notfound.html status 404 /
# TODO-Caddy </VirtualHost> }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment