Renaming debconf fields to fully descriptive names.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 30 insertions, 30 deletions

diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index d987936..90f690a 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -7,27 +7,27 @@ CONFFILES="/etc/compute-tools/container.conf /etc/compute-tools/container.conf.d
 . /usr/share/debconf/confmodule
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/machines || true
+db_input low open-infrastructure-container-tools/machines-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/config || true
+db_input low open-infrastructure-container-tools/config-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/debconf || true
+db_input low open-infrastructure-container-tools/debconf-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/hooks || true
+db_input low open-infrastructure-container-tools/hooks-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/keys || true
+db_input low open-infrastructure-container-tools/keys-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
-db_input low open-infrastructure-container-tools/cache || true
+db_input low open-infrastructure-container-tools/cache-directory || true
 db_go
 
 db_settitle open-infrastructure-container-tools/title
diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst
index f697b3b..02dd0ff 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -100,23 +100,23 @@ case "${1}" in
 	configure)
 		. /usr/share/debconf/confmodule
 
-		db_get open-infrastructure-container-tools/machines
-		MACHINES="${RET:-/var/lib/machines}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/machines-directory
+		MACHINES_DIRECTORY="${RET:-/var/lib/machines}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/config
-		CONFIG="${RET:-/etc/compute-tools/config}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/config-directory
+		CONFIG_DIRECTORY="${RET:-/etc/compute-tools/config}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/debconf
-		DEBCONF="${RET:-/etc/compute-tools/debconf}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/debconf-directory
+		DEBCONF_DIRECTORY="${RET:-/etc/compute-tools/debconf}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/hooks
-		HOOKS="${RET:-/etc/compute-tools/hooks}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/hooks-directory
+		HOOKS_DIRECTORY="${RET:-/etc/compute-tools/hooks}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/keys
-		KEYS="${RET:-/etc/compute-tools/keys}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/keys-directory
+		KEYS_DIRECTORY="${RET:-/etc/compute-tools/keys}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/cache
-		CACHE="${RET:-/var/cache/container}" # string (w/o empty)
+		db_get open-infrastructure-container-tools/cache-directory
+		CACHE_DIRECTORY="${RET:-/var/cache/container}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/directory-permissions
 		DIRECTORY_PERMISSIONS="${RET}" # select (w/o empty)
@@ -129,12 +129,12 @@ case "${1}" in
 
 		db_stop
 
-		Install "/var/lib/machines" "${MACHINES}"
-		Install "/etc/compute-tools/config" "${CONFIG}"
-		Install "/etc/compute-tools/debconf" "${DEBCONF}"
-		Install "/etc/compute-tools/hooks" "${HOOKS}"
-		Install "/etc/compute-tools/keys" "${KEYS}"
-		Install "/var/cache/container" "${CACHE}"
+		Install "/var/lib/machines" "${MACHINES_DIRECTORY}"
+		Install "/etc/compute-tools/config" "${CONFIG_DIRECTORY}"
+		Install "/etc/compute-tools/debconf" "${DEBCONF_DIRECTORY}"
+		Install "/etc/compute-tools/hooks" "${HOOKS_DIRECTORY}"
+		Install "/etc/compute-tools/keys" "${KEYS_DIRECTORY}"
+		Install "/var/cache/container" "${CACHE_DIRECTORY}"
 
 		Upgrade
 
diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates
index dfd615d..be95022 100644
--- a/debian/open-infrastructure-container-tools.templates
+++ b/debian/open-infrastructure-container-tools.templates
@@ -2,7 +2,7 @@ Template: open-infrastructure-container-tools/title
 Type: title
 _Description: container-tools: Setup
 
-Template: open-infrastructure-container-tools/machines
+Template: open-infrastructure-container-tools/machines-directory
 Type: string
 Default: /var/lib/machines
 _Description: machines directory:
@@ -11,7 +11,7 @@ _Description: machines directory:
  If unsure, use /var/lib/machines (default) or /srv/container/system
  when using shared storage.
 
-Template: open-infrastructure-container-tools/config
+Template: open-infrastructure-container-tools/config-directory
 Type: string
 Default: /etc/compute-tools/config
 _Description: config directory:
@@ -21,7 +21,7 @@ _Description: config directory:
  If unsure, use /etc/compute-tools/config (default) or
  /srv/container/config when using shared storage.
 
-Template: open-infrastructure-container-tools/debconf
+Template: open-infrastructure-container-tools/debconf-directory
 Type: string
 Default: /etc/compute-tools/debconf
 _Description: debconf directory:
@@ -31,7 +31,7 @@ _Description: debconf directory:
  If unsure, use /etc/compute-tools/debconf (default) or
  /srv/container/debconf when using shared storage.
 
-Template: open-infrastructure-container-tools/hooks
+Template: open-infrastructure-container-tools/hooks-directory
 Type: string
 Default: /etc/compute-tools/hooks
 _Description: debconf directory:
@@ -41,7 +41,7 @@ _Description: debconf directory:
  If unsure, use /etc/compute-tools/hooks (default) or
  /srv/container/hooks when using shared storage.
 
-Template: open-infrastructure-container-tools/keys
+Template: open-infrastructure-container-tools/keys-directory
 Type: string
 Default: /etc/compute-tools/keys
 _Description: debconf directory:
@@ -51,7 +51,7 @@ _Description: debconf directory:
  If unsure, use /etc/compute-tools/keys (default) or
  /srv/container/keys when using shared storage.
 
-Template: open-infrastructure-container-tools/cache
+Template: open-infrastructure-container-tools/cache-directory
 Type: string
 Default: /var/cache/container
 _Description: cache directory: