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
Ophélie Gagnard
slapos
Commits
10818c26
Commit
10818c26
authored
Sep 20, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Generalize script parameter
parent
268475ef
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+2
-2
software/caddy-frontend/instance-frontend.cfg.in
software/caddy-frontend/instance-frontend.cfg.in
+3
-3
software/caddy-frontend/templates/graceful-script.sh.in
software/caddy-frontend/templates/graceful-script.sh.in
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
10818c26
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
[profile-frontend]
filename = instance-frontend.cfg.in
filename = instance-frontend.cfg.in
md5sum =
631a2036198cdd3f76b239e0a36247c5
md5sum =
80175cd9f3ae3c6feccbc0bdbad399fe
[profile-master]
[profile-master]
filename = instance-master.cfg.in
filename = instance-master.cfg.in
...
@@ -78,7 +78,7 @@ md5sum = 77d60840591de67b64ab3572e46273a0
...
@@ -78,7 +78,7 @@ md5sum = 77d60840591de67b64ab3572e46273a0
[template-graceful-script]
[template-graceful-script]
_update_hash_filename_ = templates/graceful-script.sh.in
_update_hash_filename_ = templates/graceful-script.sh.in
md5sum =
061cc244558fd3af2b6bacf17cae5555
md5sum =
905e395b67c0a2b214b9f0099c8dc939
[template-validate-script]
[template-validate-script]
_update_hash_filename_ = templates/validate-script.sh.in
_update_hash_filename_ = templates/validate-script.sh.in
...
...
software/caddy-frontend/instance-frontend.cfg.in
View file @
10818c26
...
@@ -689,7 +689,7 @@ output = ${directory:etc-run}/frontend-caddy-safe-graceful
...
@@ -689,7 +689,7 @@ output = ${directory:etc-run}/frontend-caddy-safe-graceful
extra-context =
extra-context =
key graceful_reload_command caddy-configuration:frontend-graceful-command
key graceful_reload_command caddy-configuration:frontend-graceful-command
key c
addy_c
onfiguration_state frontend-caddy-configuration-state-graceful:output
key configuration_state frontend-caddy-configuration-state-graceful:output
[frontend-caddy-validate]
[frontend-caddy-validate]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -852,7 +852,7 @@ output = ${directory:etc-run}/backend-haproxy-safe-graceful
...
@@ -852,7 +852,7 @@ output = ${directory:etc-run}/backend-haproxy-safe-graceful
extra-context =
extra-context =
key graceful_reload_command backend-haproxy-configuration:graceful-command
key graceful_reload_command backend-haproxy-configuration:graceful-command
key c
addy_c
onfiguration_state backend-haproxy-configuration-state-graceful:output
key configuration_state backend-haproxy-configuration-state-graceful:output
[backend-haproxy-validate]
[backend-haproxy-validate]
<= jinja2-template-base
<= jinja2-template-base
...
@@ -1021,7 +1021,7 @@ output = ${directory:etc-run}/slave-introspection-safe-graceful
...
@@ -1021,7 +1021,7 @@ output = ${directory:etc-run}/slave-introspection-safe-graceful
extra-context =
extra-context =
key graceful_reload_command caddy-configuration:slave-introspection-graceful-command
key graceful_reload_command caddy-configuration:slave-introspection-graceful-command
key c
addy_c
onfiguration_state slave-introspection-configuration-state-graceful:output
key configuration_state slave-introspection-configuration-state-graceful:output
[slave-introspection-validate]
[slave-introspection-validate]
<= jinja2-template-base
<= jinja2-template-base
...
...
software/caddy-frontend/templates/graceful-script.sh.in
View file @
10818c26
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
set
-e
set
-e
if
{{
c
addy_c
onfiguration_state
}}
;
then
if
{{
configuration_state
}}
;
then
echo
"Reloading.."
echo
"Reloading.."
{{
graceful_reload_command
}}
{{
graceful_reload_command
}}
else
else
...
...
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