Merge lp://staging/~elachuni/ubuntu-webcatalog/deploy into lp://staging/ubuntu-webcatalog
Proposed by
Anthony Lenton
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Łukasz Czyżykowski | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 22 | ||||||||
| Proposed branch: | lp://staging/~elachuni/ubuntu-webcatalog/deploy | ||||||||
| Merge into: | lp://staging/ubuntu-webcatalog | ||||||||
| Diff against target: |
749 lines (+437/-167) 13 files modified
.bzrignore (+3/-0) debian/control (+8/-1) django_project/config/main.cfg (+98/-0) django_project/settings.py (+24/-156) django_project/urls.py (+8/-0) fabtasks/bootstrap.py (+32/-0) fabtasks/upgrade_from_package.py (+4/-3) requirements.txt (+8/-3) setup.py (+20/-4) src/webcatalog/context_processors.py (+26/-0) src/webcatalog/middleware/exception.py (+127/-0) src/webcatalog/schema.py (+61/-0) src/webcatalog/wsgi.py (+18/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~elachuni/ubuntu-webcatalog/deploy | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical ISD hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Added several infrastructure modules and classes.
Description of the change
Overview
========
This branch adds standard ISD modules and classes, prepping for a deployment.
Details
=======
Integration for the following was added in this branch:
- (django-)configglue
- django-preflight
- django-adminaudit
- django-pgtools
- Google analytics
- django_openid_auth (for admin authentication)
- wsgi-oops
To post a comment you must log in.
Revision history for this message
| Łukasz Czyżykowski (lukasz-czyzykowski) wrote | # |
Revision history for this message
| ISD Branch Mangler (isd-branches-mangler) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There are still some RnR/SCA leftovers in the code, lines:
- 54 (mentions devportal),
- 676 (comment mentions sca-deploy)
Also, if you add user=postgres in [default_database], will enable to run against PostgreSQL without the need for one bit of config (and this setting is ignored by SQLite).