17 files changed, 40 insertions, 23 deletions
diff --git a/libexec/container/auto b/libexec/container/auto
index 6c1d47b..4c39e2d 100755
--- a/libexec/container/auto
+++ b/libexec/container/auto
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 
 Parameters ()
 {
diff --git a/libexec/container/console b/libexec/container/console
index 2dc6546..912a259 100755
--- a/libexec/container/console
+++ b/libexec/container/console
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/libexec/container/create b/libexec/container/create
index bdf9fb4..91ba4c6 100755
--- a/libexec/container/create
+++ b/libexec/container/create
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 SCRIPTS="/usr/share/${PROJECT}/${PROGRAM}/scripts"
 CONFIG_TEMPLATE="/usr/share/${PROJECT}/${PROGRAM}/config/container.conf.in"
diff --git a/libexec/container/enter b/libexec/container/enter
index fed1193..d89ceec 100755
--- a/libexec/container/enter
+++ b/libexec/container/enter
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/libexec/container/key b/libexec/container/key
index 4cbdaa0..56eb9d2 100755
--- a/libexec/container/key
+++ b/libexec/container/key
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-KEYS="/etc/${PROJECT}/${PROGRAM}/keys"
+KEYS="/etc/${SOFTWARE}/keys"
 
 Parameters ()
 {
diff --git a/libexec/container/limit b/libexec/container/limit
index 99ef03a..ec07fe6 100755
--- a/libexec/container/limit
+++ b/libexec/container/limit
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/libexec/container/list b/libexec/container/list
index ba794ab..6f9f533 100755
--- a/libexec/container/list
+++ b/libexec/container/list
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 VERSION="$(${PROGRAM} version)"
diff --git a/libexec/container/log b/libexec/container/log
index a18c421..6674e13 100755
--- a/libexec/container/log
+++ b/libexec/container/log
@@ -20,6 +20,7 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
diff --git a/libexec/container/move b/libexec/container/move
index e20d8a8..5f65b21 100755
--- a/libexec/container/move
+++ b/libexec/container/move
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-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/libexec/container/remove b/libexec/container/remove
index 75ebd60..01161fa 100755
--- a/libexec/container/remove
+++ b/libexec/container/remove
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-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/libexec/container/restart b/libexec/container/restart
index 3c84f4d..04708a1 100755
--- a/libexec/container/restart
+++ b/libexec/container/restart
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/libexec/container/run b/libexec/container/run
index f6323c0..c72c1b6 100755
--- a/libexec/container/run
+++ b/libexec/container/run
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/libexec/container/start b/libexec/container/start
index 30aee53..4e31f72 100755
--- a/libexec/container/start
+++ b/libexec/container/start
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 START="false"
diff --git a/libexec/container/status b/libexec/container/status
index a4b49e1..25c9b95 100755
--- a/libexec/container/status
+++ b/libexec/container/status
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-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/libexec/container/stop b/libexec/container/stop
index 6b8caee..8de825b 100755
--- a/libexec/container/stop
+++ b/libexec/container/stop
@@ -20,11 +20,12 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 CLEAN="false"
diff --git a/libexec/container/top b/libexec/container/top
index d9baa1c..f71f7c3 100755
--- a/libexec/container/top
+++ b/libexec/container/top
@@ -20,6 +20,7 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
diff --git a/libexec/container/version b/libexec/container/version
index c2b7716..f74c696 100755
--- a/libexec/container/version
+++ b/libexec/container/version
@@ -20,10 +20,11 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 SHARE="/usr/share/${PROJECT}/${PROGRAM}"
 
 # Pre hooks