From: Tim Pierce <twp@clinicalfuture.com>
Date: Wed, 4 Dec 2013 19:35:00 +0000 (-0500)
Subject: API_SUPERUSER_TOKEN must be named API_SUPERUSER_SECRET to be autogenerated.
X-Git-Tag: 1.1.0~2863^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/26cc68189591ba94ffa2bdc406a9af4b6661771c

API_SUPERUSER_TOKEN must be named API_SUPERUSER_SECRET to be autogenerated.
---

diff --git a/docker/api/superuser_token.in b/docker/api/superuser_token.in
index bb869d3f4e..49bb34ef05 100644
--- a/docker/api/superuser_token.in
+++ b/docker/api/superuser_token.in
@@ -1 +1 @@
-@@API_SUPERUSER_TOKEN@@
+@@API_SUPERUSER_SECRET@@
diff --git a/docker/config.yml.example b/docker/config.yml.example
index 1df39b313e..137252b2ba 100644
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -50,7 +50,7 @@ API_SECRET:
 # the API server, before an administrative user has been created.
 # Necessary for bootstrapping, e.g. so Keep can register with
 # the API server before any users have been added.
-API_SUPERUSER_TOKEN: 
+API_SUPERUSER_SECRET:
 
 # More than anything this should be auto-generated, but
 # we don't presently have a good place to store it. So just
diff --git a/docker/warehouse/warehouse.conf.in b/docker/warehouse/warehouse.conf.in
index c8f0fd4bee..8c3c0aaad1 100644
--- a/docker/warehouse/warehouse.conf.in
+++ b/docker/warehouse/warehouse.conf.in
@@ -7,6 +7,6 @@ $Warehouse::warehouses = [
       'keep0.@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@:25107',
       'keep0.@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@:25108',
      ],
-     'api_auth_token'=>'@@API_SUPERUSER_TOKEN@@',
+     'api_auth_token'=>'@@API_SUPERUSER_SECRET@@',
     },
 ];