From 0dae10eab4b832a206a159fb35a9f51a7e4d10ae Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Tue, 18 Aug 2015 15:27:39 -0700
Subject: [PATCH] Remove unused secret HASH_SALT.

(imported from commit 831c4cb7680b7bf8dadbd930195175e9a4186356)
---
 scripts/setup/generate_enterprise_secrets.py | 2 +-
 zproject/local_settings_template.py          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/setup/generate_enterprise_secrets.py b/scripts/setup/generate_enterprise_secrets.py
index 89d45a2250..0483a15f76 100755
--- a/scripts/setup/generate_enterprise_secrets.py
+++ b/scripts/setup/generate_enterprise_secrets.py
@@ -18,7 +18,7 @@ CAMO_CONFIG_FILENAME = '/etc/default/camo'
 if not os.path.exists(SETTINGS_FILENAME):
     print "Unable to find settings file at %s" % (SETTINGS_FILENAME,)
 
-AUTOGENERATED_SETTINGS = ['SHARED_SECRET', 'HASH_SALT', 'AVATAR_SALT', 'RABBITMQ_PASSWORD']
+AUTOGENERATED_SETTINGS = ['SHARED_SECRET', 'AVATAR_SALT', 'RABBITMQ_PASSWORD']
 
 def generate_camo_config_file(camo_key):
     camo_config = """ENABLED=yes
diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py
index f1a8684c35..75692fe7d2 100644
--- a/zproject/local_settings_template.py
+++ b/zproject/local_settings_template.py
@@ -197,7 +197,6 @@ AUTH_LDAP_USER_ATTR_MAP = {
 # PLEASE DO NOT CHANGE THEM WITHOUT INSTRUCTIONS FROM ZULIP SUPPORT
 CAMO_KEY = ''
 SECRET_KEY = ''
-HASH_SALT = ''
 RABBITMQ_PASSWORD = ''
 AVATAR_SALT = ''
 SHARED_SECRET = ''