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
Léo-Paul Géneau
slapos
Commits
3a492cd0
Commit
3a492cd0
authored
May 29, 2019
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix "caddy-frontend: Do not emit garbage during validation"
Stderr to null redirection happened in the wrong place.
parent
7333ff11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+2
-2
software/caddy-frontend/templates/graceful-script.sh.in
software/caddy-frontend/templates/graceful-script.sh.in
+1
-1
software/caddy-frontend/templates/validate-script.sh.in
software/caddy-frontend/templates/validate-script.sh.in
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
3a492cd0
...
@@ -94,11 +94,11 @@ md5sum = b9f73f6323f9fceea054c46c854d2862
...
@@ -94,11 +94,11 @@ md5sum = b9f73f6323f9fceea054c46c854d2862
[template-graceful-script]
[template-graceful-script]
filename = templates/graceful-script.sh.in
filename = templates/graceful-script.sh.in
md5sum =
2c5f15b3906dc64a76d7e88d6dee8dfe
md5sum =
959f49437cffb096368f0b6434f06d3d
[template-validate-script]
[template-validate-script]
filename = templates/validate-script.sh.in
filename = templates/validate-script.sh.in
md5sum =
a23831f38b7d3aca6639e12f115f4a79
md5sum =
3174bf29f439d14e292f8719bba19a7a
[caddyprofiledeps-setup]
[caddyprofiledeps-setup]
filename = setup.py
filename = setup.py
...
...
software/caddy-frontend/templates/graceful-script.sh.in
View file @
3a492cd0
...
@@ -4,7 +4,7 @@ SIGNATURE_FILE={{ signature_file }}
...
@@ -4,7 +4,7 @@ SIGNATURE_FILE={{ signature_file }}
NSIGNATURE_FILE
={{
signature_file
}}
.tmp
NSIGNATURE_FILE
={{
signature_file
}}
.tmp
touch
$SIGNATURE_FILE
touch
$SIGNATURE_FILE
{{
sha256sum
}}
{{
path_list
}}
|
sort
-k
66
>
$NSIGNATURE_FILE
2> /dev/null
{{
sha256sum
}}
{{
path_list
}}
2> /dev/null |
sort
-k
66
>
$NSIGNATURE_FILE
# If no diff, no restart for now
# If no diff, no restart for now
if
diff
"
$SIGNATURE_FILE
"
"
$NSIGNATURE_FILE
"
>
/dev/null
;
then
if
diff
"
$SIGNATURE_FILE
"
"
$NSIGNATURE_FILE
"
>
/dev/null
;
then
...
...
software/caddy-frontend/templates/validate-script.sh.in
View file @
3a492cd0
...
@@ -7,7 +7,7 @@ NSIGNATURE_FILE={{ signature_file }}.tmp
...
@@ -7,7 +7,7 @@ NSIGNATURE_FILE={{ signature_file }}.tmp
SIGNATURE_STATUS
={{
signature_file
}}
.status
SIGNATURE_STATUS
={{
signature_file
}}
.status
touch
$SIGNATURE_FILE
touch
$SIGNATURE_FILE
{{
sha256sum
}}
{{
path_list
}}
|
sort
-k
66
>
$NSIGNATURE_FILE
2> /dev/null
{{
sha256sum
}}
{{
path_list
}}
2> /dev/null |
sort
-k
66
>
$NSIGNATURE_FILE
if
diff
"
$SIGNATURE_FILE
"
"
$NSIGNATURE_FILE
"
>
/dev/null
;
then
if
diff
"
$SIGNATURE_FILE
"
"
$NSIGNATURE_FILE
"
>
/dev/null
;
then
rm
-f
"
$NSIGNATURE_FILE
"
rm
-f
"
$NSIGNATURE_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