Moving config files from /etc/open-infrastructure to /etc/compute-tools.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>

4 files changed, 8 insertions, 7 deletions

diff --git a/share/scripts/curl b/share/scripts/curl
index 465ecbe..7d7661a 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -24,8 +24,8 @@ SOFTWARE="compute-tools"
 PROGRAM="container"
 SCRIPT="${0}"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
-KEYS="/etc/${PROJECT}/${PROGRAM}/keys"
+HOOKS="/etc/${SOFTWARE}/hooks"
+KEYS="/etc/${SOFTWARE}/keys"
 MACHINES="/var/lib/machines"
 CACHE="/var/cache/${PROJECT}/${PROGRAM}/system"
 
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 7f2bf3d..0147212 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -25,8 +25,8 @@ PROGRAM="container"
 SCRIPT="${0}"
 export SCRIPT
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index 4fec6b0..edf26a0 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -20,9 +20,10 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/debconf"
+CONFIG="/etc/${SOFTWARE}/debconf"
 
 DEBCONF_NOWARNINGS="true"
 export DEBCONF_NOWARNINGS
@@ -43,7 +44,7 @@ then
 elif [ "$(ls ${CONFIG}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ]
 then
 	# user did not specify a pressed file, but there is 1 (and only 1)
-	# matching in a sub-directory of /etc/${PROJECT}/${PROGRAM}/debconf
+	# matching in a sub-directory of /etc/${SOFTWARE}/debconf
 
 	FILE="$(ls ${CONFIG}/*/${NAME}.cfg)"
 
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index 98f202b..13a7746 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -25,7 +25,7 @@ PROGRAM="container"
 
 SCRIPT="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()