kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

Fix remarks on __uacme_obtain.

Browse source
This commit is contained in:
sparrowhawk 2021-03-16 13:04:26 +01:00
parent f4caa52750
commit 73c14825bc
No known key found for this signature in database
GPG key ID: 6778C9C29C02D691
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
type/__uacme_obtain/gencode-remote
View file

@ -19,5 +19,6 @@ then
confdir="$(cat "${__object:?}/parameter/confdir")" confdir="$(cat "${__object:?}/parameter/confdir")"
fi fi
# Run renew script 'by hand' - renews will be handled by the cronjob. # Run renew script 'by hand' for intial issue - renews will be handled by the
# cronjob.
echo "$confdir/${__object_id:?}/renew.sh" echo "$confdir/${__object_id:?}/renew.sh"

10
type/__uacme_obtain/man.rst
View file

@ -1,5 +1,5 @@
cdist-type__uacme_obtain(7) cdist-type__uacme_obtain(7)
======================== ===========================
NAME NAME
---- ----
@ -8,7 +8,7 @@ cdist-type__uacme_obtain - obtain, renew and deploy Let's Encrypt certificates
DESCRIPTION DESCRIPTION
----------- -----------
This type leverage uacme to issue abd renew Let's Encrypt certificates and This type leverage uacme to issue and renew Let's Encrypt certificates and
provides a simple deployment mechanism. It is expected to be called after provides a simple deployment mechanism. It is expected to be called after
`__uacme_account`. `__uacme_account`.
@ -26,10 +26,10 @@ confdir
uacme configuration directory. uacme configuration directory.
hookscript hookscript
Path to challenge hook program. Path to the challenge hook program.
owner owner
Owner of installed certificate (e.g. `www-data`), pass as argument to `chown`. Owner of installed certificate (e.g. `www-data`), passed to `chown`.
install-cert-to install-cert-to
Installation path of the issued certificate. Installation path of the issued certificate.
@ -44,7 +44,7 @@ force-cert-ownership-to
Override default ownership for TLS certificate, passed as argument to chown. Override default ownership for TLS certificate, passed as argument to chown.
OPTIONAL MULTIPLE PARAMETERS OPTIONAL MULTIPLE PARAMETERS
------------------- ----------------------------
altdomains altdomains
Alternative domain names for this certificate. Alternative domain names for this certificate.

2
type/__uacme_obtain/manifest
View file

@ -15,7 +15,7 @@ case "$os" in
;; ;;
esac esac
CHALLENGEDIR=$default_challengedir CHALLENGEDIR=${default_challengedir:?}
if [ -f "${__object:?}/parameter/challengedir" ]; if [ -f "${__object:?}/parameter/challengedir" ];
then then
CHALLENGEDIR="$(cat "${__object:?}/parameter/challengedir")" CHALLENGEDIR="$(cat "${__object:?}/parameter/challengedir")"