Ratings and Reviews server

Merge lp://qastaging/~kelvin.li/rnr-server/charm-supports into lp://qastaging/rnr-server

  1. charm-supports
  2. Merge into trunk
Proposed by Kelvin Li
Status: Merged
Approved by: Kelvin Li
Approved revision: 358
Merged at revision: 302
Proposed branch: lp://qastaging/~kelvin.li/rnr-server/charm-supports
Merge into: lp://qastaging/rnr-server
Diff against target: 621 lines (+264/-182)
12 files modified
Makefile (+49/-11)
README (+2/-9)
config-manager.txt (+3/-1)
django_project/settings_base.py (+10/-3)
django_project/settings_build.py (+7/-0)
django_project/settings_devel.py (+1/-0)
django_project/wsgi.py (+1/-1)
src/core/tests/test_wsgi.py (+114/-0)
src/core/wsgi.py (+75/-0)
src/reviewsapp/templates/reviewsapp/overview.html (+2/-1)
src/reviewsapp/tests/test_wsgi.py (+0/-104)
src/reviewsapp/wsgi.py (+0/-52)
To merge this branch: bzr merge lp://qastaging/~kelvin.li/rnr-server/charm-supports
Reviewer Review Type Date Requested Status
Michael Nelson (community) Approve
Review via email: mp+260244@code.qastaging.launchpad.net

Commit message

- use the whitenoise dependency to manage the static assets
- add the conf-manager-juju.txt for rnr charm and keep old bootstrap work without issue
- some juju purpose improvement in MakeFile

Description of the change

use the whitenoise dependency to manage the static assets
add the conf-manager-juju.txt for rnr charm and keep old bootstrap work without issue
some juju purpose improvement in MakeFile

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

Looks good. I've got a few comments below, but I think it'd be great to get Fabien's review too, as he knows more about rnr (and it's current deployment setup) I think.

Great stuff!

lp://qastaging/~kelvin.li/rnr-server/charm-supports updated
350. By Kelvin Li

turn the SERVE_STATIC_MEDIA off

Revision history for this message
Kelvin Li (kelvin.li) :
Revision history for this message
Michael Nelson (michael.nelson) wrote :

If you're still around when Fabien starts, ask him to check too, but +1 from me :) (and we'll be able to verify on staging that it works as expected)

06:06 < noodles> kelvin: so, for the current metal deployment, whitenoise's middleware won't even be hit correct? As the apache middle-end (?) will continue to serve the /assets/ directly?
06:15 < kelvin> noodles: yes, I think the /assets/ is serving by apache directly and rnr-project didn't involve the collectstatic by itself in production but by some other scripts which I don't know. If we want to make the whitenoise work without issue on metal, we have to point the STATIC_ROOT to the correct path.
06:22 < noodles> kelvin: I'd leave the metal service as is - if it's working as is with apache serving those files, great. FWIW, I don't think there are any other scripts - it doesn't need to collectstatic, as it's only serving the static for those two apps, which are both explicitly Alias'd in the apache config.

review: Approve
Revision history for this message
Michael Nelson (michael.nelson) :
lp://qastaging/~kelvin.li/rnr-server/charm-supports updated
351. By Kelvin Li

revert static storage back to the normal one, to make sure it works in metal environment

352. By Kelvin Li

add the revno in header

353. By Kelvin Li

update the project name in MakeFile to keep consistent in charm

Revision history for this message
Fabián Ezequiel Gallina (fgallina) wrote :

Added a few nitpicks and questions but otherwise this looks great!

lp://qastaging/~kelvin.li/rnr-server/charm-supports updated
354. By Kelvin Li

updates according reviews

Revision history for this message
Kelvin Li (kelvin.li) wrote :

some updates according to the review comments.

lp://qastaging/~kelvin.li/rnr-server/charm-supports updated
355. By Kelvin Li

fix the incorrect tarball name

356. By Kelvin Li

added the relocated wsgi and related test py files(missed in last commit

357. By Kelvin Li

removed virtualenv dependency for juju deployment

358. By Kelvin Li

Merged 2 config-manager.txt to remove the mutiple-files maintenance

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: