From 76f9470335aa93648fddb21e616a724b8d2a000a Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 17 Aug 2015 06:09:19 +0000 Subject: [PATCH] Fix local_settings.py.example to be consistently styled horizon/openstack_dashboard/local/local_settings.py.example currently contains inconsistent styling. the settings file should consistently use '#' to comment out potential code and '# ' to comment out code commentary. this change ensures this consistency, as well as, correcting the location of an import statement. -all potential code that should be commented out uses '#' -import statement for secret_key is relocated to the top of the module Change-Id: If9cde0a13d279f11ce5cbfe2caa9c7e3c71eeff0 Closes-Bug: #1483845 --- .../local/local_settings.py.example | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 4ae507afdf..1691d89f80 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -2,6 +2,8 @@ import os from django.utils.translation import ugettext_lazy as _ +from horizon.utils import secret_key + from openstack_dashboard import exceptions from openstack_dashboard.settings import HORIZON_CONFIG @@ -12,13 +14,13 @@ TEMPLATE_DEBUG = DEBUG # WEBROOT is the location relative to Webserver root # should end with a slash. WEBROOT = '/' -# LOGIN_URL = WEBROOT + 'auth/login/' -# LOGOUT_URL = WEBROOT + 'auth/logout/' +#LOGIN_URL = WEBROOT + 'auth/login/' +#LOGOUT_URL = WEBROOT + 'auth/logout/' # # LOGIN_REDIRECT_URL can be used as an alternative for # HORIZON_CONFIG.user_home, if user_home is not set. # Do not set it to '/home/', as this will cause circular redirect loop -# LOGIN_REDIRECT_URL = WEBROOT +#LOGIN_REDIRECT_URL = WEBROOT # Required for Django 1.5. # If horizon is running in production (DEBUG is False), set this @@ -99,7 +101,6 @@ LOCAL_PATH = os.path.dirname(os.path.abspath(__file__)) # (usually behind a load-balancer). Either you have to make sure that a session # gets all requests routed to the same dashboard instance or you set the same # SECRET_KEY for all of them. -from horizon.utils import secret_key SECRET_KEY = secret_key.generate_or_read_from_file( os.path.join(LOCAL_PATH, '.secret_key_store')) @@ -323,7 +324,7 @@ TIME_ZONE = "UTC" # Set this to True to display an 'Admin Password' field on the Change Password # form to verify that it is indeed the admin logged-in who wants to change # the password. -# ENFORCE_PASSWORD_CHECK = False +#ENFORCE_PASSWORD_CHECK = False # Modules that provide /auth routes that can be used to handle different types # of user authentication. Add auth plugins that require extra route handling to @@ -364,8 +365,8 @@ TIME_ZONE = "UTC" # creating users and databases on database instances is turned on. # To disable these extensions set the permission here to something # unusable such as ["!"]. -# TROVE_ADD_USER_PERMS = [] -# TROVE_ADD_DATABASE_PERMS = [] +#TROVE_ADD_USER_PERMS = [] +#TROVE_ADD_DATABASE_PERMS = [] # Change this patch to the appropriate static directory containing # two files: _variables.scss and _styles.scss @@ -649,4 +650,4 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES'] # where iframes are not used in deployment. Default setting is True. # For more information see: # http://tinyurl.com/anticlickjack -# DISALLOW_IFRAME_EMBED = True +#DISALLOW_IFRAME_EMBED = True