Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Acme Downloader
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Geant DevOps
Acme Downloader
Commits
82f4a23f
Unverified
Commit
82f4a23f
authored
3 years ago
by
Max Adamo
Browse files
Options
Downloads
Patches
Plain Diff
minor fix
parent
84dfc663
Branches
Branches containing commit
Tags
v1.0.9
Tags containing commit
No related merge requests found
Pipeline
#58766
passed
3 years ago
Stage: upload_linux_shell
Stage: upload_linux_amd64_binary
Stage: upload_windows_amd64_binary
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
acme-downloader.sh
+4
-3
4 additions, 3 deletions
acme-downloader.sh
with
4 additions
and
3 deletions
acme-downloader.sh
+
4
−
3
View file @
82f4a23f
...
@@ -166,7 +166,7 @@ done
...
@@ -166,7 +166,7 @@ done
TYPE
=
$(
echo
$TYPE
|
tr
'[:lower:]'
'[:upper:]'
)
TYPE
=
$(
echo
$TYPE
|
tr
'[:lower:]'
'[:upper:]'
)
check_version
$0
#
check_version $0
if
[[
-n
$UPDATE
]]
;
then
if
[[
-n
$UPDATE
]]
;
then
curl
$SCRIPT_URL
-o
$0
curl
$SCRIPT_URL
-o
$0
...
@@ -191,9 +191,9 @@ if [[ $TYPE != "EV" ]] && [[ $TYPE != "OV" ]]; then
...
@@ -191,9 +191,9 @@ if [[ $TYPE != "EV" ]] && [[ $TYPE != "OV" ]]; then
usage
usage
fi
fi
if
[[
-z
$WILDCARD
]]
;
then
if
[[
-z
$WILDCARD
]]
;
then
$
MODIFIED_CERT_NAME
=
"wildcard_
${
CERT_NAME
}
"
MODIFIED_CERT_NAME
=
$
CERT_NAME
else
else
$
MODIFIED_CERT_NAME
=
$
CERT_NAME
MODIFIED_CERT_NAME
=
"wildcard_
${
CERT_NAME
}
"
fi
fi
[[
-z
$DAYS
]]
&&
DAYS
=
30
[[
-z
$DAYS
]]
&&
DAYS
=
30
[[
-z
$CERT_DESTINATION
]]
&&
CERT_DESTINATION
=
"
${
CERT_BASE
}
/
${
MODIFIED_CERT_NAME
}
.crt"
[[
-z
$CERT_DESTINATION
]]
&&
CERT_DESTINATION
=
"
${
CERT_BASE
}
/
${
MODIFIED_CERT_NAME
}
.crt"
...
@@ -206,6 +206,7 @@ MINUTES=$((${DAYS} * 86400))
...
@@ -206,6 +206,7 @@ MINUTES=$((${DAYS} * 86400))
# give up if the certificate expiration is still within a proper range
# give up if the certificate expiration is still within a proper range
if
openssl x509
-checkend
$MINUTES
-noout
-in
$FULLCHAIN_DESTINATION
&>/dev/null
;
then
if
openssl x509
-checkend
$MINUTES
-noout
-in
$FULLCHAIN_DESTINATION
&>/dev/null
;
then
echo
"the certificate
$FULLCHAIN_DESTINATION
is still valid"
rm
-f
$TMP_CERT
$TMP_FULLCHAIN
$TMP_CA
$TMP_KEY
rm
-f
$TMP_CERT
$TMP_FULLCHAIN
$TMP_CA
$TMP_KEY
exit
0
exit
0
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment