From 75f00a623e5386540a56b636b18a42c44fbe04a5 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Mon, 25 Jul 2016 18:25:25 +0100
Subject: [PATCH] revert the config copy routine, was replacing existing files

---
 root/etc/cont-init.d/30-config | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index c5ddf23..e94e42a 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -1,5 +1,4 @@
 #!/usr/bin/with-contenv bash
-shopt -s globstar nullglob
 
 # create folders
 mkdir -p \
@@ -7,14 +6,17 @@ mkdir -p \
 	/var/cache/smokeping
 
 # copy config files
-for file in /defaults/smoke-conf/*
+
+PREV_DIR=$(pwd)
+
+cd /defaults/smoke-conf || exit
+	for i in $(find . -type f)
  	do
-		if [ ! -f "/config/${file}" ]
- 		then
-		cp "${file}" "/config/"
- 	fi
+		[[ ! -e "/config/${i}" ]] && cp -v "${i}" "/config/${i}"
  	done
 
+cd "${PREV_DIR}" || exit
+
 # make symlinks
 [[ ! -e /var/www/localhost/smokeping ]] && ln -s \
 	/usr/share/webapps/smokeping /var/www/localhost/smokeping