From d67b04897f6ef173fd564ba91ecad9d1f88d9a8b Mon Sep 17 00:00:00 2001
From: ldericher <jmmiehe@gmx.de>
Date: Thu, 13 Aug 2020 11:31:41 +0200
Subject: [PATCH] "TARGETROOT" -> "TARGET_ROOT", "kiwihub" -> "kiwi_hub"

---
 Makefile             | 22 +++++++++++-----------
 example/base.conf    |  4 ++--
 example/kiwi.yml     |  2 +-
 src/kiwi_default.yml |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 388f4c4..449d921 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ $(error KIWI_HUB_CIDR not set in $(CONF_WILDC))
 endif
 
 # persistent data directory
-CONF_TARGETROOT:=$(call confvalue,TARGETROOT)
-ifeq ($(CONF_TARGETROOT),)
-$(error TARGETROOT not set in $(CONF_WILDC))
+CONF_TARGET_ROOT:=$(call confvalue,TARGET_ROOT)
+ifeq ($(CONF_TARGET_ROOT),)
+$(error TARGET_ROOT not set in $(CONF_WILDC))
 endif
 
 # suffix for project directories
@@ -56,7 +56,7 @@ endif
 # CONSTANTS
 
 # file to store docker network cidr
-KIWI_HUB_FILE:=$(CONF_TARGETROOT)/up-$(CONF_KIWI_HUB_NAME)
+KIWI_HUB_FILE:=$(CONF_TARGET_ROOT)/up-$(CONF_KIWI_HUB_NAME)
 
 # remove any suffix $2 from $1
 rmsuffix=$(patsubst %$2,%,$1)
@@ -78,8 +78,8 @@ kiwicompose=$(call docker_bash,\
 	cd "$<"; \
 	$(CONF_SOURCE) \
 	COMPOSE_PROJECT_NAME="$(call projname,$<)" \
-	CONFDIR="$(CONF_TARGETROOT)/conf" \
-	TARGETDIR="$(CONF_TARGETROOT)/$<" \
+	CONFDIR="$(CONF_TARGET_ROOT)/conf" \
+	TARGETDIR="$(CONF_TARGET_ROOT)/$<" \
 	$(DOCKER_COMPOSE) $(1))
 
 #########
@@ -101,7 +101,7 @@ $(KIWI_HUB_FILE):
 	@$(DOCKER) run --rm \
 		-v "/:/mnt" -u root alpine:latest \
 		ash -c '\
-			mkdir -p "$(addprefix /mnt, $(CONF_TARGETROOT))"; \
+			mkdir -p "$(addprefix /mnt, $(CONF_TARGET_ROOT))"; \
 			echo "$(CONF_KIWI_HUB_CIDR)" > "$(addprefix /mnt, $(KIWI_HUB_FILE))"; \
 		'
 
@@ -136,12 +136,12 @@ ifneq ($(wildcard *${PROJ_SUFFX}/conf),)
 		$(DOCKER) build -t ldericher/kiwi-config:rsync . -f- &> /dev/null
 
 	$(eval sources:=$(wildcard *${PROJ_SUFFX}/conf))
-	@echo "Syncing $(sources) to $(CONF_TARGETROOT) ..."
+	@echo "Syncing $(sources) to $(CONF_TARGET_ROOT) ..."
 
 	$(eval sources:=$(realpath $(sources)))
 	$(eval sources:=$(addprefix /mnt, $(sources)))
 	$(eval sources:=$(patsubst %,'%',$(sources)))
-	$(eval dest:='$(addprefix /mnt, $(CONF_TARGETROOT))')
+	$(eval dest:='$(addprefix /mnt, $(CONF_TARGET_ROOT))')
 
 	@$(DOCKER) run --rm \
 		-v "/:/mnt" -u root ldericher/kiwi-config:rsync \
@@ -152,11 +152,11 @@ endif
 
 .PHONY: purge-conf
 purge-conf:
-	@echo "Emptying $(CONF_TARGETROOT)/conf ..."
+	@echo "Emptying $(CONF_TARGET_ROOT)/conf ..."
 	@$(DOCKER) run --rm \
 		-v "/:/mnt" -u root alpine:latest \
 		ash -c '\
-			rm -rf "$(addprefix /mnt, $(CONF_TARGETROOT)/conf)"; \
+			rm -rf "$(addprefix /mnt, $(CONF_TARGET_ROOT)/conf)"; \
 		'
 
 #########
diff --git a/example/base.conf b/example/base.conf
index 80f2b32..3b2f803 100644
--- a/example/base.conf
+++ b/example/base.conf
@@ -1,7 +1,7 @@
 export SUFFIX_PROJECT=.project
 export SUFFIX_DOWN=.down
 
-export KIWI_HUB_NAME=kiwihub
+export KIWI_HUB_NAME=kiwi_hub
 export KIWI_HUB_CIDR=10.22.46.0/24
 
-export TARGETROOT=/tmp/kiwi
+export TARGET_ROOT=/tmp/kiwi
diff --git a/example/kiwi.yml b/example/kiwi.yml
index 139c3c4..a78bc97 100644
--- a/example/kiwi.yml
+++ b/example/kiwi.yml
@@ -13,5 +13,5 @@ markers:
   down: .down
 
 network:
-  name: kiwihub
+  name: kiwi_hub
   cidr: 10.22.46.0/24
diff --git a/src/kiwi_default.yml b/src/kiwi_default.yml
index 0174e5f..2e5cd0c 100644
--- a/src/kiwi_default.yml
+++ b/src/kiwi_default.yml
@@ -6,5 +6,5 @@ markers:
   project: .project
   down: .down
 network:
-  name: kiwihub
+  name: kiwi_hub
   cidr: 10.22.46.0/24