From 03b5200d8b552d48c8ca8d4165b5bab89bd9f64b Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Tue, 16 May 2017 22:02:02 -0700
Subject: [PATCH] generate_secrets: Reformat list of autogenerated secrets.

---
 scripts/setup/generate_secrets.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/setup/generate_secrets.py b/scripts/setup/generate_secrets.py
index 4ea1af13ef..c7617c38db 100755
--- a/scripts/setup/generate_secrets.py
+++ b/scripts/setup/generate_secrets.py
@@ -26,8 +26,14 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..', '..'))
 
 CAMO_CONFIG_FILENAME = '/etc/default/camo'
 
-AUTOGENERATED_SETTINGS = ['shared_secret', 'avatar_salt', 'rabbitmq_password', 'local_database_password',
-                          'initial_password_salt']
+# Standard, 64-bit tokens
+AUTOGENERATED_SETTINGS = [
+    'avatar_salt',
+    'initial_password_salt',
+    'local_database_password',
+    'rabbitmq_password',
+    'shared_secret',
+]
 
 # TODO: We can eliminate this function if we refactor the install
 # script to run generate_secrets before zulip-puppet-apply.