Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
certman
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
Container registry
Model registry
Operate
Environments
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
IML Open Source
certman
Commits
6c45cba4
Commit
6c45cba4
authored
3 years ago
by
Hahn Axel (hahn)
Browse files
Options
Downloads
Patches
Plain Diff
softer behaviour: do not revoke changed certs (add does not stop; ensure does not delete)
parent
fc25dbab
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cm.sh
+9
-5
9 additions, 5 deletions
cm.sh
with
9 additions
and
5 deletions
cm.sh
+
9
−
5
View file @
6c45cba4
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
# 2021-04-12 <axel.hahn@iml.unibe.ch> optional: force excecution with a given user only
# 2021-04-12 <axel.hahn@iml.unibe.ch> optional: force excecution with a given user only
# 2021-06-24 <axel.hahn@iml.unibe.ch> added transfer command; delete files if acme.sh --install-cert ... failes
# 2021-06-24 <axel.hahn@iml.unibe.ch> added transfer command; delete files if acme.sh --install-cert ... failes
# 2021-07-14 <axel.hahn@iml.unibe.ch> added _wait_for_free_slot in cert actions to execute multiple processes sequentially
# 2021-07-14 <axel.hahn@iml.unibe.ch> added _wait_for_free_slot in cert actions to execute multiple processes sequentially
# 2021-09-27 <axel.hahn@iml.unibe.ch> softer behaviour: do not revoke changed certs (add does not stop; ensure does not delete)
# ======================================================================
# ======================================================================
...
@@ -82,8 +83,10 @@ function _certMustExist(){
...
@@ -82,8 +83,10 @@ function _certMustExist(){
function
_certMustNotExist
(){
function
_certMustNotExist
(){
_certExists
_certExists
if
[
$?
-eq
0
]
;
then
if
[
$?
-eq
0
]
;
then
echo
"ERROR: cert
${
CM_fqdn
}
was added already."
echo
"WARNING: cert
${
CM_fqdn
}
was added already."
exit
1
# exit 1
echo
"Press Ctrl+C to abort within the next 10 sec..."
sleep
10
fi
fi
}
}
...
@@ -327,7 +330,7 @@ function _testFqdncount(){
...
@@ -327,7 +330,7 @@ function _testFqdncount(){
function
public_add
(){
function
public_add
(){
_wait_for_free_slot
_wait_for_free_slot
_requiresFqdn
_requiresFqdn
_certMustNotExist
_certMustNotExist
for
myhost
in
$(
echo
$CM_fqdn
$*
)
for
myhost
in
$(
echo
$CM_fqdn
$*
)
do
do
...
@@ -378,8 +381,9 @@ function public_ensure(){
...
@@ -378,8 +381,9 @@ function public_ensure(){
_wd
"--- DNS aliases match ... renew it (ignore --force - it comes from acme.sh)"
_wd
"--- DNS aliases match ... renew it (ignore --force - it comes from acme.sh)"
public_renew
$*
public_renew
$*
else
else
_wd
"--- DNS aliases do NOT match ... deleting cert and create a new one"
# _wd "--- DNS aliases do NOT match ... deleting cert and create a new one"
public_delete
$*
# public_delete $*
_wd
"--- DNS aliases do NOT match ... creating a new one"
public_add
$*
public_add
$*
fi
fi
else
else
...
...
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