From 97ffd85c9287a0d4e4503170ee3fb7419c7f8841 Mon Sep 17 00:00:00 2001
From: Juergen Weigert <jnweiger@gmail.com>
Date: Wed, 3 Jun 2020 12:49:50 +0200
Subject: [PATCH] =?UTF-8?q?run=20felix'=20eos-compose=20setup=20from=20a?=
 =?UTF-8?q?=20rundum-gl=C3=BCcklich-wrapper=20hetzner-deploy/make=5Focis?=
 =?UTF-8?q?=5Feos=5Fcompose=5Ftest.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/hcloud_tf/terraform/variables.tf      |  2 --
 .../make_ocis_eos_compose_test.sh             | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/examples/hetzner-deploy/lib/hcloud_tf/terraform/variables.tf b/examples/hetzner-deploy/lib/hcloud_tf/terraform/variables.tf
index 35ca75d..07d5e83 100644
--- a/examples/hetzner-deploy/lib/hcloud_tf/terraform/variables.tf
+++ b/examples/hetzner-deploy/lib/hcloud_tf/terraform/variables.tf
@@ -43,8 +43,6 @@ variable "server_keys" {
   type = "list"
 
   default = [
-#    "rkaussow@owncloud",
-#    "crodriguez@xps15z",
 #    "jw@owncloud.com",
   ]
 }
diff --git a/examples/hetzner-deploy/make_ocis_eos_compose_test.sh b/examples/hetzner-deploy/make_ocis_eos_compose_test.sh
index 08756bf..dc23faf 100755
--- a/examples/hetzner-deploy/make_ocis_eos_compose_test.sh
+++ b/examples/hetzner-deploy/make_ocis_eos_compose_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #  https://github.com/owncloud-docker/compose-playground/blob/master/examples/eos-compose/README.md
-#  https://etherpad.owncloud.com/p/fixocis 
+#  https://etherpad.owncloud.com/p/fixocis
 #  https://owncloud.github.io/
 #
 # 2020-05-24, jw@owncloud.com
@@ -17,8 +17,8 @@ if [ -z "$IPADDR" ]; then
 fi
 
 if [ -z "$OCIS_VERSION" ]; then
-  # export OCIS_VERSION=master
-  export OCIS_VERSION=v1.0.0-beta4
+  export OCIS_VERSION=master
+  # export OCIS_VERSION=v1.0.0-beta4
   echo "No OCIS_VERSION specified, using $OCIS_VERSION"
   sleep 3
 fi
@@ -54,15 +54,8 @@ LOAD_SCRIPT <<EOF
     echo OCIS_DOMAIN=$IPADDR >> .env
     sleep 10
   fi
-  docker-compose up -d mgm-master fst quark-2 quark-3 quark-1 mq-master
 
-  sleep 5
-  sleep 5
-  sleep 5
-  sleep 5
-  sleep 5
-
-  docker-compose up -d ocis
+  docker-compose up -d
 
   sleep 5
   if [ -f ~/make_machine.bashrc ]; then
@@ -86,6 +79,10 @@ LOAD_SCRIPT <<EOF
 
    https://$IPADDR:9200
 
+# Start ocis with
+
+   docker-compose up ocis
+
 # View the logs with
 
    docker-compose logs -f