relax machine-id check for now (zokradonh#336)

Signed-off-by: Felix Bartels <[email protected]>
Kopano-dev · Feb 7, 2020 · 5f10e98 · 5f10e98
1 parent 736943c
commit 5f10e98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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/