Updating all directory paths for new upstream version.

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

5 files changed, 41 insertions, 41 deletions

diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index 3d6f9e5..0c694fa 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFFILE="/etc/open-infrastructure/container.conf"
+CONFFILE="/etc/compute-tools/container.conf"
 
 . /usr/share/debconf/confmodule
 
@@ -30,9 +30,9 @@ db_settitle open-infrastructure-container-tools/title
 db_input low open-infrastructure-container-tools/cache || true
 db_go
 
-if [ -e /usr/share/open-infrastructure/container/scripts ]
+if [ -e /usr/share/compute-tools/scripts ]
 then
-	SCRIPT_CHOICES="$(cd /usr/share/open-infrastructure/container/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
+	SCRIPT_CHOICES="$(cd /usr/share/compute-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
 	db_subst open-infrastructure-container-tools/script SCRIPT_CHOICES "$(echo ${SCRIPT_CHOICES} | sed -e 's| |, |g')"
 
 	if [ -x /usr/bin/lsb_release ]
diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst
index f04f12b..1cac16a 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFFILE="/etc/open-infrastructure/container.conf"
+CONFFILE="/etc/compute-tools/container.conf"
 
 Install ()
 {
@@ -40,11 +40,11 @@ Install ()
 
 case "${1}" in
 	configure)
-		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/curl 1000
-		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/mmdebstrap 2000
-		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debootstrap 3000
-		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/progress-linux 4000
-		update-alternatives --quiet --install /usr/share/open-infrastructure/container/scripts/default container_script /usr/share/open-infrastructure/container/scripts/debian 5000
+		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/curl 1000
+		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/mmdebstrap 2000
+		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/debootstrap 3000
+		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/progress-linux 4000
+		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/debian 5000
 
 		. /usr/share/debconf/confmodule
 
@@ -52,19 +52,19 @@ case "${1}" in
 		MACHINES="${RET:-/var/lib/machines}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/config
-		CONFIG="${RET:-/etc/container-tools/config}" # string (w/o empty)
+		CONFIG="${RET:-/etc/compute-tools/config}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/debconf
-		DEBCONF="${RET:-/etc/container-tools/debconf}" # string (w/o empty)
+		DEBCONF="${RET:-/etc/compute-tools/debconf}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/hooks
-		HOOKS="${RET:-/etc/container-tools/hooks}" # string (w/o empty)
+		HOOKS="${RET:-/etc/compute-tools/hooks}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/keys
-		KEYS="${RET:-/etc/container-tools/keys}" # string (w/o empty)
+		KEYS="${RET:-/etc/compute-tools/keys}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/cache
-		CACHE="${RET:-/var/cache/container-tools}" # string (w/o empty)
+		CACHE="${RET:-/var/cache/container}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/script
 		SCRIPT="${RET:-debian}" # string (w/o empty)
@@ -75,13 +75,13 @@ case "${1}" in
 		db_stop
 
 		Install "/var/lib/machines" "${MACHINES}"
-		Install "/etc/open-infrastructure/container/config" "${CONFIG}"
-		Install "/etc/open-infrastructure/container/debconf" "${DEBCONF}"
-		Install "/etc/open-infrastructure/container/hooks" "${HOOKS}"
-		Install "/etc/open-infrastructure/container/keys" "${KEYS}"
-		Install "/var/cache/open-infrastructure/container" "${CACHE}"
+		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}"
 
-		update-alternatives --quiet --set container_script "/usr/share/open-infrastructure/container/scripts/${SCRIPT}"
+		update-alternatives --quiet --set container_script "/usr/share/compute-tools/scripts/${SCRIPT}"
 
 		if [ ! -e "${CONFFILE}" ]
 		then
diff --git a/debian/open-infrastructure-container-tools.postrm b/debian/open-infrastructure-container-tools.postrm
index ab1ea41..c68ac1c 100755
--- a/debian/open-infrastructure-container-tools.postrm
+++ b/debian/open-infrastructure-container-tools.postrm
@@ -29,16 +29,16 @@ Remove ()
 
 case "${1}" in
 	remove)
-		Remove /var/cache/open-infrastructure/container
-		Remove /etc/open-infrastructure/container/debconf
-		Remove /etc/open-infrastructure/container/config
-		Remove /etc/open-infrastructure/container/hooks
-		Remove /etc/open-infrastructure/container/keys
+		Remove /var/cache/container
+		Remove /etc/compute-tools/debconf
+		Remove /etc/compute-tools/config
+		Remove /etc/compute-tools/hooks
+		Remove /etc/compute-tools/keys
 		Remove /var/lib/machines
 		;;
 
 	purge)
-		rm -f /etc/open-infrastructure/container.conf
+		rm -f /etc/compute-tools/container.conf
 		;;
 
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/open-infrastructure-container-tools.prerm b/debian/open-infrastructure-container-tools.prerm
index 49a9470..fa7b814 100755
--- a/debian/open-infrastructure-container-tools.prerm
+++ b/debian/open-infrastructure-container-tools.prerm
@@ -4,11 +4,11 @@ set -e
 
 case "${1}" in
 	remove|upgrade|deconfigure)
-		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/curl
-		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/mmdebstrap
-		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debootstrap
-		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/progress-linux
-		update-alternatives --quiet --remove container_script /usr/share/open-infrastructure/container/scripts/debian
+		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/curl
+		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/mmdebstrap
+		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/debootstrap
+		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/progress-linux
+		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/debian
 		;;
 
 	failed-upgrade)
diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates
index d251028..a10de0a 100644
--- a/debian/open-infrastructure-container-tools.templates
+++ b/debian/open-infrastructure-container-tools.templates
@@ -13,52 +13,52 @@ _Description: machines directory:
 
 Template: open-infrastructure-container-tools/config
 Type: string
-_Default: /etc/open-infrastructure/container/config
+_Default: /etc/compute-tools/config
 _Description: config directory:
  Please specify the directory that will be used to store the container
  configuration files.
  .
- If unsure, use /etc/open-infrastructure/container/config (default) or
+ If unsure, use /etc/compute-tools/config (default) or
  /srv/container/config when using shared storage.
 
 Template: open-infrastructure-container-tools/debconf
 Type: string
-_Default: /etc/open-infrastructure/container/debconf
+_Default: /etc/compute-tools/debconf
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  preseed files.
  .
- If unsure, use /etc/open-infrastructure/container/debconf (default) or
+ If unsure, use /etc/compute-tools/debconf (default) or
  /srv/container/debconf when using shared storage.
 
 Template: open-infrastructure-container-tools/hooks
 Type: string
-_Default: /etc/open-infrastructure/container/hooks
+_Default: /etc/compute-tools/hooks
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  hooks.
  .
- If unsure, use /etc/open-infrastructure/container/hooks (default) or
+ If unsure, use /etc/compute-tools/hooks (default) or
  /srv/container/hooks when using shared storage.
 
 Template: open-infrastructure-container-tools/keys
 Type: string
-_Default: /etc/open-infrastructure/container/keys
+_Default: /etc/compute-tools/keys
 _Description: debconf directory:
  Please specify the directory that will be used to store the container
  keys for verifying container image downloads.
  .
- If unsure, use /etc/open-infrastructure/container/keys (default) or
+ If unsure, use /etc/compute-tools/keys (default) or
  /srv/container/keys when using shared storage.
 
 Template: open-infrastructure-container-tools/cache
 Type: string
-_Default: /var/cache/open-infrastructure/container
+_Default: /var/cache/container
 _Description: cache directory:
  Please specify the directory that will be used to cache files during
  creation of containers.
  .
- If unsure, use /var/cache/open-infrastructure/container (default) or
+ If unsure, use /var/cache/container (default) or
  /srv/container/cache when using shared storage.
 
 Template: open-infrastructure-container-tools/script