Juju Charms Collection
openstack-dashboard package

Merge lp:~gnuoy/charms/precise/openstack-dashboard/fix-loginurl into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

  1. Precise Pangolin (12.04)
  2. fix-loginurl
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 31
Proposed branch: lp:~gnuoy/charms/precise/openstack-dashboard/fix-loginurl
Merge into: lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 67 lines (+18/-0)
4 files modified
templates/folsom/local_settings.py (+4/-0)
templates/grizzly/local_settings.py (+4/-0)
templates/havana/local_settings.py (+5/-0)
templates/icehouse/local_settings.py (+5/-0)
To merge this branch: bzr merge lp:~gnuoy/charms/precise/openstack-dashboard/fix-loginurl
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+221687@code.launchpad.net

This proposal supersedes a proposal from 2014-05-28.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/folsom/local_settings.py'
2--- templates/folsom/local_settings.py 2014-02-27 10:07:57 +0000
3+++ templates/folsom/local_settings.py 2014-06-02 09:23:40 +0000
4@@ -156,7 +156,11 @@
5
6 # Default Ubuntu apache configuration uses /horizon as the application root.
7 # Configure auth redirects here accordingly.
8+{% if webroot == "/" %}
9+LOGIN_URL='/auth/login/'
10+{% else %}
11 LOGIN_URL='{{ webroot }}/auth/login/'
12+{% endif %}
13 LOGIN_REDIRECT_URL='{{ webroot }}'
14
15 # The Ubuntu package includes pre-compressed JS and compiled CSS to allow
16
17=== modified file 'templates/grizzly/local_settings.py'
18--- templates/grizzly/local_settings.py 2014-02-27 10:07:57 +0000
19+++ templates/grizzly/local_settings.py 2014-06-02 09:23:40 +0000
20@@ -97,7 +97,11 @@
21
22 # Default Ubuntu apache configuration uses /horizon as the application root.
23 # Configure auth redirects here accordingly.
24+{% if webroot == "/" %}
25+LOGIN_URL='/auth/login/'
26+{% else %}
27 LOGIN_URL='{{ webroot }}/auth/login/'
28+{% endif %}
29 LOGIN_REDIRECT_URL='{{ webroot }}'
30
31 # The Ubuntu package includes pre-compressed JS and compiled CSS to allow
32
33=== modified file 'templates/havana/local_settings.py'
34--- templates/havana/local_settings.py 2014-02-27 10:07:57 +0000
35+++ templates/havana/local_settings.py 2014-06-02 09:23:40 +0000
36@@ -459,8 +459,13 @@
37
38 # Default Ubuntu apache configuration uses /horizon as the application root.
39 # Configure auth redirects here accordingly.
40+{% if webroot == "/" %}
41+LOGIN_URL='/auth/login/'
42+LOGOUT_URL='/auth/logout/'
43+{% else %}
44 LOGIN_URL='{{ webroot }}/auth/login/'
45 LOGOUT_URL='{{ webroot }}/auth/logout/'
46+{% endif %}
47 LOGIN_REDIRECT_URL='{{ webroot }}'
48
49 # The Ubuntu package includes pre-compressed JS and compiled CSS to allow
50
51=== modified file 'templates/icehouse/local_settings.py'
52--- templates/icehouse/local_settings.py 2014-04-10 16:29:08 +0000
53+++ templates/icehouse/local_settings.py 2014-06-02 09:23:40 +0000
54@@ -484,8 +484,13 @@
55
56 # Default Ubuntu apache configuration uses /horizon as the application root.
57 # Configure auth redirects here accordingly.
58+{% if webroot == "/" %}
59+LOGIN_URL='/auth/login/'
60+LOGOUT_URL='/auth/logout/'
61+{% else %}
62 LOGIN_URL='{{ webroot }}/auth/login/'
63 LOGOUT_URL='{{ webroot }}/auth/logout/'
64+{% endif %}
65 LOGIN_REDIRECT_URL='{{ webroot }}'
66
67 # The Ubuntu package includes pre-compressed JS and compiled CSS to allow

Subscribers

People subscribed via source and target branches