Compare commits

...

5 Commits

Author SHA1 Message Date
44dbbdd396 tweak worker first run config logic
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-21 10:50:30 +00:00
e99cb9c5dd better permission detection 2023-07-21 10:50:05 +00:00
242902aef6 fix init folder permissions on creation 2023-07-21 10:44:01 +00:00
28ec5906ac fix not running multiple scripts in /config/init 2023-07-21 10:11:17 +00:00
73ef869c30 fix /config/init permissions 2023-07-20 11:39:23 +00:00
2 changed files with 7 additions and 7 deletions

View File

@ -43,24 +43,26 @@ fi
if [ -d /config/init ]; then
if [ "$(ls -A /config/init)" ]; then
echo "Running additional startup scripts."
bash /config/init/*
for f in /config/init/*.sh; do
bash "$f"
done
else
echo "/config/init is empty - no additional startup scripts detected."
fi
else
echo "Directory /config/init not found. Creating."
mkdir /config/init
mkdir /config/init && chown -R cronicle:cronicle /config/init
fi
echo "Checking permissions in /config and /app."
if [ ! "$(stat -c %u /app)" -eq "${PUID}" ] || [ ! "$(stat -c %g /app)" -eq "${PGID}" ]
if [ -n "$(find /app \! -user ${PUID})" ] || [ -n "$(find /app \! -group ${PGID})" ]
then
echo "Fixing permissions for /app (this can take some time)."
chown -R cronicle:cronicle /app
fi
if [ ! "$(stat -c %u /config)" -eq "${PUID}" ] || [ ! "$(stat -c %g /config)" -eq "${PGID}" ]
if [ -n "$(find /config \! -user ${PUID})" ] || [ -n "$(find /config \! -group ${PGID})" ]
then
echo "Fixing permissions for /config (this can take some time)."
chown -R cronicle:cronicle /config

View File

@ -80,10 +80,8 @@ then
then
echo "No config found. Copy config.json from the manager server and place it in /config/cronicle/conf dir."
cp -r /app/cronicle/conf /config/cronicle/conf
cp -R /app/cronicle/conf /config/cronicle/conf
rm -rf /config/cronicle/conf/config.json
rm -rf /app/cronicle/conf
ln -s /config/cronicle/conf /app/cronicle/conf
echo ''
echo ''
echo '*************************************'