From c84a27ca70e6c2178fc4319b0e44eb2201a08a2b Mon Sep 17 00:00:00 2001
From: Laura Herzog <quellmalz.laura@gmail.com>
Date: Wed, 8 Sep 2021 10:45:56 +0200
Subject: [PATCH] Hotfixes

---
 src/lib/instances/create/create.sh               | 1 +
 src/stack/states/dev/devtools/githook-post-merge | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/instances/create/create.sh b/src/lib/instances/create/create.sh
index fc10aa36..7b431adb 100755
--- a/src/lib/instances/create/create.sh
+++ b/src/lib/instances/create/create.sh
@@ -391,6 +391,7 @@ doil_send_status "Setting up instance configuration"
 GRAIN_MYSQL_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')
 GRAIN_CRON_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13 ; echo '')
 docker exec -ti saltmain bash -c "salt '${NAME}.${SUFFIX}' grains.set 'mysql_password' ${GRAIN_MYSQL_PASSWORD} --out=quiet"
+docker exec -ti saltmain bash -c "salt '${NAME}.${SUFFIX}' grains.set 'cron_password' ${GRAIN_MYSQL_PASSWORD} --out=quiet"
 docker exec -ti saltmain bash -c "salt '${NAME}.${SUFFIX}' grains.set 'doil_domain' http://${DOIL_HOST}/${NAME} --out=quiet"
 docker exec -ti saltmain bash -c "salt '${NAME}.${SUFFIX}' grains.set 'doil_project_name' ${NAME} --out=quiet"
 sleep 5
diff --git a/src/stack/states/dev/devtools/githook-post-merge b/src/stack/states/dev/devtools/githook-post-merge
index af3ac3f3..d58dd419 100644
--- a/src/stack/states/dev/devtools/githook-post-merge
+++ b/src/stack/states/dev/devtools/githook-post-merge
@@ -5,7 +5,7 @@ SKIN_PATH="./Customizing/global/skin/custom"
 
 echo "Compile css with lessc "
 
-TEMPLATES=$(grep "style" ${SKIN_PATH}/template.xml | cut -d\ -f4 | tr -d '"')
+TEMPLATES=$(grep "style" ${SKIN_PATH}/template.xml | cut -d\  -f4 | tr -d '"')
 for TEMPLATE in ${TEMPLATES};
 do
 	echo ${TEMPLATE}