From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 28 Aug 2020 02:17:31 +0000 (-0400)
Subject: 16749: Put AutoAdminFirstUser back
X-Git-Tag: 2.1.0~103^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/43da0e7ce859cb8ed3385417a2fc97a36cc688e6

16749: Put AutoAdminFirstUser back

Fix git clone to use git.arvados.org

Fix typo redundant 'InternalURLs' field

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index a15da4694f..1bd0f3a66c 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -240,7 +240,7 @@ run() {
             git -C "$COMPOSER_ROOT" pull
         fi
         if ! test -d "$WORKBENCH2_ROOT" ; then
-            git clone https://github.com/arvados/arvados-workbench2.git "$WORKBENCH2_ROOT"
+            git clone https://git.arvados.org/arvados-workbench2.git "$WORKBENCH2_ROOT"
         fi
 
         if [[ "$CONFIG" = test ]] ; then
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index 6bc43e2b7a..ed728204fa 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -8,13 +8,13 @@ ARG composer_version=arvados-fork
 ARG workbench2_version=master
 
 RUN cd /usr/src && \
-    git clone --no-checkout https://github.com/arvados/arvados.git && \
+    git clone --no-checkout https://git.arvados.org/arvados.git && \
     git -C arvados checkout ${arvados_version} && \
     git -C arvados pull && \
     git clone --no-checkout https://github.com/arvados/composer.git && \
     git -C composer checkout ${composer_version} && \
     git -C composer pull && \
-    git clone --no-checkout https://github.com/arvados/arvados-workbench2.git workbench2 && \
+    git clone --no-checkout https://git.arvados.org/arvados-workbench2.git workbench2 && \
     git -C workbench2 checkout ${workbench2_version} && \
     git -C workbench2 pull && \
     chown -R 1000:1000 /usr/src
diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 3ae1abe62e..28af50613d 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -104,8 +104,6 @@ Clusters:
         InternalURLs:
           "http://localhost:${services[keep-web]}/": {}
         ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
-        InternalURLs:
-          "http://localhost:${services[keep-web]}/": {}
       Composer:
         ExternalURL: "https://$localip:${services[composer]}"
       Controller:
@@ -136,7 +134,7 @@ Clusters:
         Enable: true
     Users:
       NewUsersAreActive: true
-      AutoAdminUserWithEmail: admin@example.com
+      AutoAdminFirstUser: true
       AutoSetupNewUsers: true
       AutoSetupNewUsersWithVmUUID: $vm_uuid
       AutoSetupNewUsersWithRepository: true