diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-04 16:48:38 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-04 17:01:37 +0000 |
commit | 2ca157f04bcf867ea945eaaefcb11cbe071f58ed (patch) | |
tree | e909eda9ea0b9d45486f1a9fffd20e67c8a9ac66 /debian/open-infrastructure-dehydrated-tools.config | |
parent | Correcting typo in debconf templates for dehydrated/auto-cleanup field. (diff) | |
download | open-infrastructure-service-tools-2ca157f04bcf867ea945eaaefcb11cbe071f58ed.tar.xz open-infrastructure-service-tools-2ca157f04bcf867ea945eaaefcb11cbe071f58ed.zip |
Reworking dehydrated debconf handling completely.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/open-infrastructure-dehydrated-tools.config')
-rw-r--r-- | debian/open-infrastructure-dehydrated-tools.config | 78 |
1 files changed, 27 insertions, 51 deletions
diff --git a/debian/open-infrastructure-dehydrated-tools.config b/debian/open-infrastructure-dehydrated-tools.config index 28c38ed..8d636fd 100644 --- a/debian/open-infrastructure-dehydrated-tools.config +++ b/debian/open-infrastructure-dehydrated-tools.config @@ -2,50 +2,51 @@ set -e -for FILE in /etc/dehydrated/config /etc/dehydrated/conf.d/*.sh -do - if [ -e "${FILE}" ] - then - . ${FILE} || true - fi -done - . /usr/share/debconf/confmodule -if [ -n "${CA}" ] +CONFFILE="/etc/dehydrated/conf.d/config.sh" + +if [ -e "${CONFFILE}" ] then + . ${CONFFILE} || true + + db_set open-infrastructure-dehydrated-tools/auto-cleanup "${AUTO_CLEANUP}" db_set open-infrastructure-dehydrated-tools/ca "${CA}" + db_set open-infrastructure-dehydrated-tools/challengetype "${CHALLENGETYPE}" + db_set open-infrastructure-dehydrated-tools/contact-email "${CONTACT_EMAIL}" + db_set open-infrastructure-dehydrated-tools/ocsp-fetch "${OCSP_FETCH}" + db_set open-infrastructure-dehydrated-tools/ocsp-must-staple "${OCSP_MUST_STAPLE}" + db_set open-infrastructure-dehydrated-tools/basedir "${BASEDIR}" + db_set open-infrastructure-dehydrated-tools/hooks "${HOOKS}" + db_set open-infrastructure-dehydrated-tools/register "${REGISTER}" fi db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/ca || true +db_input low open-infrastructure-dehydrated-tools/auto-cleanup "${AUTO_CLEANUP}" || true db_go -if [ -n "${AUTO_CLEANUP}" ] -then - db_set open-infrastructure-dehydrated-tools/auto-cleanup "${AUTO_CLEANUP}" -fi +db_settitle open-infrastructure-dehydrated-tools/title +db_input low open-infrastructure-dehydrated-tools/ca "${CA}" || true +db_go db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/auto-cleanup || true +db_input low open-infrastructure-dehydrated-tools/challengetype "${CHALLENGETYPE}" || true db_go -if [ -n "${CHALLENGETYPE}" ] -then - db_set open-infrastructure-dehydrated-tools/challengetype "${CHALLENGETYPE}" -fi +db_settitle open-infrastructure-dehydrated-tools/title +db_input low open-infrastructure-dehydrated-tools/contact-email "${CONTACT_EMAIL}" || true +db_go db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/challengetype || true +db_input low open-infrastructure-dehydrated-tools/ocsp-fetch "${OCSP_FETCH}" || true db_go -if [ -n "${CONTACT_EMAIL}" ] -then - db_set open-infrastructure-dehydrated-tools/contact-email "${CONTACT_EMAIL}" -fi +db_settitle open-infrastructure-dehydrated-tools/title +db_input low open-infrastructure-dehydrated-tools/ocsp-must-staple "${OCSP_MUST_STAPLE}" || true +db_go db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/contact-email || true +db_input low open-infrastructure-dehydrated-tools/basedir "${BASEDIR}" || true db_go if [ -e /usr/share/dehydrated/hooks ] @@ -59,32 +60,7 @@ then fi db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/basedir || true -db_go - -if ! ls /var/lib/dehydrated/accounts/*/account_key.pem > /dev/null 2>&1 -then - db_settitle open-infrastructure-dehydrated-tools/title - db_input low open-infrastructure-dehydrated-tools/register || true - db_go -fi - -if [ -n "${OCSP_FETCH}" ] -then - db_set open-infrastructure-dehydrated-tools/ocsp-fetch "${OCSP_FETCH}" -fi - -db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/ocsp-fetch || true -db_go - -if [ -n "${OCSP_MUST_STAPLE}" ] -then - db_set open-infrastructure-dehydrated-tools/ocsp-must-staple "${OCSP_MUST_STAPLE}" -fi - -db_settitle open-infrastructure-dehydrated-tools/title -db_input low open-infrastructure-dehydrated-tools/ocsp-must-staple || true +db_input low open-infrastructure-dehydrated-tools/register "${REGISTER}" || true db_go db_stop |