← Back to branch summary

~ubuntu-branches/ubuntu/utopic/horizon/utopic

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_settings.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-10-13 13:26:23 UTC
  • mfrom: (0.6.1) (1.2.3) (70.1.5 utopic-proposed)
  • Revision ID: package-import@ubuntu.com-20141013132623-l5gutvnbx6ry3mxh
Tags: 1:2014.2~rc2-0ubuntu1
https://launchpad.net/bugs/1380594
* New upstream release candidate.
  - d/p/*: Refresh.
  - Compile translations during package build:
    + d/control: Add BD's to support compilation of translations. 
    + d/rules: Cleanup/compile translations as required.
* d/watch: Only match versions starting with digits.
* d/rules: Link in bootstrap scss assets directory to static root to
  ensure that font based icons for buttons can be rendered (LP: #1380594).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_settings.patch
9
9
 TEMPLATE_DEBUG = DEBUG
10
10
 
11
11
 # Required for Django 1.5.
12
 
@@ -95,24 +95,40 @@ LOCAL_PATH = os.path.dirname(os.path.abs
 
12
@@ -95,25 +95,24 @@ LOCAL_PATH = os.path.dirname(os.path.abs
13
13
 # requests routed to the same dashboard instance or you set the same SECRET_KEY
14
14
 # for all of them.
15
15
 from horizon.utils import secret_key
41
41
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
42
42
-    }
43
43
-}
44
 
+# Enable the Ubuntu theme if it is present.
45
 
+try:
46
 
+  from ubuntu_theme import *
47
 
+except ImportError:
48
 
+  pass
49
 
+
50
 
+# Default Ubuntu apache configuration uses /horizon as the application root.
51
 
+# Configure auth redirects here accordingly.
52
 
+LOGIN_URL='/horizon/auth/login/'
53
 
+LOGOUT_URL='/horizon/auth/logout/'
54
 
+LOGIN_REDIRECT_URL='/horizon'
55
 
+
56
 
+# By default, validation of the HTTP Host header is disabled.  Production
57
 
+# installations should have this set accordingly.  For more information
58
 
+# see https://docs.djangoproject.com/en/dev/ref/settings/.
59
 
+ALLOWED_HOSTS = '*'
60
 
 
 
44
-
61
45
 # Send email to the console by default
62
46
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
63
 
@@ -529,3 +545,24 @@ SECURITY_GROUP_RULES = {
64
 
 # to set this to True if you were running Nova Networking with
65
 
 # auto_assign_floating_ip = True.
66
 
 # SAHARA_AUTO_IP_ALLOCATION_ENABLED = False
67
 
+
 
47
 # Or send them to /dev/null
 
48
@@ -536,3 +535,23 @@ SECURITY_GROUP_RULES = {
 
49
 # algorithms supported by Python's hashlib library.
 
50
 # OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5'
 
51
 
68
52
+###############################################################################
69
53
+# Ubuntu Settings
70
54
+###############################################################################
87
71
+ALLOWED_HOSTS = '*'
88
72
--- a/openstack_dashboard/settings.py
89
73
+++ b/openstack_dashboard/settings.py
90
 
@@ -339,8 +339,7 @@ if not SECRET_KEY:
 
74
@@ -337,8 +337,7 @@ if not SECRET_KEY:
91
75
                                   'local')
92
76
 
93
77
     from horizon.utils import secret_key