From 5f10e982a685ea83e2f5965390eabc59f82f2db8 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:03:05 +0100 Subject: [PATCH] relax machine-id check for now (#336) Signed-off-by: Felix Bartels --- kdav/start.sh | 6 +++--- webapp/start.sh | 6 +++--- zpush/start.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kdav/start.sh b/kdav/start.sh index c667155..4318b7d 100755 --- a/kdav/start.sh +++ b/kdav/start.sh @@ -48,9 +48,9 @@ echo "Ensure config ownership" chown -R www-data:www-data /run/sessions # services need to be aware of the machine-id -dockerize \ - -wait file:///etc/machine-id \ - -wait file:///var/lib/dbus/machine-id +#dockerize \ +# -wait file:///etc/machine-id \ +# -wait file:///var/lib/dbus/machine-id touch /var/log/kdav/kdav.log chown www-data:www-data /var/log/kdav/kdav.log diff --git a/webapp/start.sh b/webapp/start.sh index 1675adc..0e9254b 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -74,9 +74,9 @@ echo "Ensure config ownership" chown -R www-data:www-data /run/sessions /tmp/webapp /var/lib/kopano-webapp/tmp # services need to be aware of the machine-id -dockerize \ - -wait file:///etc/machine-id \ - -wait file:///var/lib/dbus/machine-id +#dockerize \ +# -wait file:///etc/machine-id \ +# -wait file:///var/lib/dbus/machine-id set +u # cleaning up env variables diff --git a/zpush/start.sh b/zpush/start.sh index 7c6e04f..4cff520 100755 --- a/zpush/start.sh +++ b/zpush/start.sh @@ -135,9 +135,9 @@ echo "Ensure config ownership" chown -R www-data:www-data /run/sessions # services need to be aware of the machine-id -dockerize \ - -wait file:///etc/machine-id \ - -wait file:///var/lib/dbus/machine-id +#dockerize \ +# -wait file:///etc/machine-id \ +# -wait file:///var/lib/dbus/machine-id echo "Activate z-push log rerouting" mkdir -p /var/log/z-push/