generate_secrets: Reformat list of autogenerated secrets.

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.