From 249af958ffb6951ce5454f38c766fc6eacd9481b Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 11 Feb 2021 16:54:01 +0100
Subject: [PATCH 1/3] remove demo users from accounts

---
 .../config/ocis/entrypoint-override.sh         | 18 ++++++++++++++++--
 .../config/ocis/entrypoint-override.sh         |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
index 9e0a524ac1..52cf0291d0 100644
--- a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -evx
+set -e
 
 ocis server&
 sleep 10
@@ -18,8 +18,22 @@ REVA_USER_UUID=$(ocis accounts list | grep " | Reva Inter " | egrep '[0-9a-f]{8}
 echo "  Reva user UUID: $REVA_USER_UUID"
 ocis accounts update --password $STORAGE_LDAP_BIND_PASSWORD $REVA_USER_UUID
 
-killall ocis
 echo "default secrets changed"
 echo "##################################################"
 
+echo "##################################################"
+echo "delete demo users:" # demo users are provided by keycloak
+
+set +e # accounts can only delete once, so it will fail the second time
+ocis accounts remove 4c510ada-c86b-4815-8820-42cdf82c3d51
+ocis accounts remove ddc2004c-0977-11eb-9d3f-a793888cd0f8
+ocis accounts remove 932b4540-8d16-481e-8ef4-588e4b6b151c
+ocis accounts remove 058bff95-6708-4fe5-91e4-9ea3d377588b
+ocis accounts remove f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c
+set -e
+
+echo "##################################################"
+
+killall ocis
+
 ocis server
diff --git a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
index 9e0a524ac1..d8fe9d24dd 100644
--- a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -evx
+set -e
 
 ocis server&
 sleep 10

From c88e544281705958731f30109ff33bbaaa50d1d5 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 12 Feb 2021 10:21:32 +0100
Subject: [PATCH 2/3] do not restart ocis after removing users, since they then
 will be readded

---
 .../ocis_keycloak/config/ocis/entrypoint-override.sh        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
index 52cf0291d0..6aa00a723e 100644
--- a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
@@ -22,7 +22,7 @@ echo "default secrets changed"
 echo "##################################################"
 
 echo "##################################################"
-echo "delete demo users:" # demo users are provided by keycloak
+echo "delete demo users" # demo users are provided by keycloak
 
 set +e # accounts can only delete once, so it will fail the second time
 ocis accounts remove 4c510ada-c86b-4815-8820-42cdf82c3d51
@@ -34,6 +34,4 @@ set -e
 
 echo "##################################################"
 
-killall ocis
-
-ocis server
+wait # wait for oCIS to exit

From 33d004a92e6bccb4d93672f692ee855c42744be9 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 12 Feb 2021 10:28:01 +0100
Subject: [PATCH 3/3] use wait also for ocis_traefik

---
 .../examples/ocis_traefik/config/ocis/entrypoint-override.sh   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
index d8fe9d24dd..c1f96fae4e 100644
--- a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
@@ -18,8 +18,7 @@ REVA_USER_UUID=$(ocis accounts list | grep " | Reva Inter " | egrep '[0-9a-f]{8}
 echo "  Reva user UUID: $REVA_USER_UUID"
 ocis accounts update --password $STORAGE_LDAP_BIND_PASSWORD $REVA_USER_UUID
 
-killall ocis
 echo "default secrets changed"
 echo "##################################################"
 
-ocis server
+wait # wait for oCIS to exit