Commit d995b4c6 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Simplify Caddy wrappers

As SIGUSR1 nor SIGUSR2 can't be used to reload caddy after anything changed
in the wrapper, limit the amount of parameters send to Caddy.
parent 596819f0
...@@ -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 = 441ebd011cd33f17b48590cc6969970a md5sum = d4eb1cf0ceb223ec07337d48c8f8c388
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
...@@ -75,7 +75,7 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 ...@@ -75,7 +75,7 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
[template-caddy-wrapper] [template-caddy-wrapper]
filename = templates/caddy-wrapper.in filename = templates/caddy-wrapper.in
md5sum = 688d06546a12aa74ff4eea59fee624b8 md5sum = 5213d8aca7231a4229ae5b8becce655f
[template-trafficserver-records-config] [template-trafficserver-records-config]
filename = templates/trafficserver/records.config.jinja2 filename = templates/trafficserver/records.config.jinja2
......
...@@ -259,11 +259,6 @@ mode = 0700 ...@@ -259,11 +259,6 @@ mode = 0700
extra-context = extra-context =
raw caddy ${caddy:output} raw caddy ${caddy:output}
key conf dynamic-apache-frontend-template:rendered key conf dynamic-apache-frontend-template:rendered
key root caddy-directory:document-root
key host instance-parameter:configuration.domain
key http_port instance-parameter:configuration.plain_http_port
key https_port instance-parameter:configuration.port
key content apache-configuration:frontend-graceful-command
key log apache-configuration:error-log key log apache-configuration:error-log
key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout
key pidfile apache-configuration:pid-file key pidfile apache-configuration:pid-file
...@@ -707,10 +702,6 @@ mode = 0700 ...@@ -707,10 +702,6 @@ mode = 0700
extra-context = extra-context =
raw caddy ${caddy:output} raw caddy ${caddy:output}
key conf nginx-configuration:output key conf nginx-configuration:output
key root caddy-directory:document-root
key host instance-parameter:configuration.domain
key http_port nginx-configuration:plain_port
key https_port nginx-configuration:port
key log nginx-configuration:error_log key log nginx-configuration:error_log
key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout
key pidfile nginx-configuration:pid-file key pidfile nginx-configuration:pid-file
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
exec {{ caddy }} \ exec {{ caddy }} \
-conf {{ conf }} \ -conf {{ conf }} \
-root {{ root }} \
-host {{ host }} \
-http-port {{ http_port }} \
-https-port {{ https_port }} \
-log {{ log }} \ -log {{ log }} \
-http2=true \ -http2=true \
-grace {{ grace }}s \ -grace {{ grace }}s \
......
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