From 2ca157f04bcf867ea945eaaefcb11cbe071f58ed Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 Sep 2021 18:48:38 +0200
Subject: Reworking dehydrated debconf handling completely.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../open-infrastructure-dehydrated-tools.templates | 60 +++++++++++-----------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'debian/open-infrastructure-dehydrated-tools.templates')

diff --git a/debian/open-infrastructure-dehydrated-tools.templates b/debian/open-infrastructure-dehydrated-tools.templates
index 0f093ab..bf7fec4 100644
--- a/debian/open-infrastructure-dehydrated-tools.templates
+++ b/debian/open-infrastructure-dehydrated-tools.templates
@@ -2,6 +2,14 @@ Template: open-infrastructure-dehydrated-tools/title
 Type: title
 Description: dehydrated-tools: Setup
 
+Template: open-infrastructure-dehydrated-tools/auto-cleanup
+Type: boolean
+Default: no
+Description: dehydrated auto clean:
+ Please select the Certificate Authority to use with dehydrated.
+ .
+ If unsure, use letsencrypt (default).
+
 Template: open-infrastructure-dehydrated-tools/ca
 Type: select
 Choices: letsencrypt, letsencrypt-test, zerossl, buypass, buypass-test
@@ -11,14 +19,6 @@ Description: dehydrated Certificate Authority (CA):
  .
  If unsure, use letsencrypt (default).
 
-Template: open-infrastructure-dehydrated-tools/auto-cleanup
-Type: boolean
-Default: no
-Description: dehydrated auto clean:
- Please select the Certificate Authority to use with dehydrated.
- .
- If unsure, use letsencrypt (default).
-
 Template: open-infrastructure-dehydrated-tools/challengetype
 Type: select
 Choices: dns-01, http-01
@@ -36,28 +36,6 @@ Description: dehydrated Contact Email:
  .
  If unsure, leave empty (default).
 
-Template: open-infrastructure-dehydrated-tools/hooks
-Type: multiselect
-Choices: ${HOOKS_CHOICES}
-Default: 
-Description: dehydrated hooks:
- Please select any hooks that should be enabled for dehydrated.
-
-Template: open-infrastructure-dehydrated-tools/basedir
-Type: string
-Default: 
-Description: dehydrated base directory:
- Please enter the base directory where all the certificates are stored.
- .
- If unsure, use /var/lib/dehydrated (default).
-
-Template: open-infrastructure-dehydrated-tools/register
-Type: boolean
-Default: false
-Description: dehydrated register:
- Should a 'dehydrated --register --accept-terms' be executed now to create
- an account for this system with your CA.
-
 Template: open-infrastructure-dehydrated-tools/ocsp-fetch
 Type: boolean
 Default: false
@@ -73,3 +51,25 @@ Description: dehydrated OCSP must staple:
  Should dehydrated request certificates that must use OCSP stapling?
  .
  If unsure, use 'no' (default).
+
+Template: open-infrastructure-dehydrated-tools/basedir
+Type: string
+Default: 
+Description: dehydrated base directory:
+ Please enter the base directory where all the certificates are stored.
+ .
+ If unsure, use /var/lib/dehydrated (default).
+
+Template: open-infrastructure-dehydrated-tools/hooks
+Type: multiselect
+Choices: ${HOOKS_CHOICES}
+Default: 
+Description: dehydrated hooks:
+ Please select any hooks that should be enabled for dehydrated.
+
+Template: open-infrastructure-dehydrated-tools/register
+Type: boolean
+Default: false
+Description: dehydrated register:
+ Should a 'dehydrated --register --accept-terms' be executed now to create
+ an account for this system with your CA.
-- 
cgit v1.2.3