Merge lp:~cjohnston/qa-dashboard/oops-docs-req into lp:qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 633
Merged at revision: 634
Proposed branch: lp:~cjohnston/qa-dashboard/oops-docs-req
Merge into: lp:qa-dashboard
Diff against target: 58 lines (+13/-10)
2 files modified
README.install (+3/-1)
deployment/apache-mod-wsgi/README (+10/-9)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/oops-docs-req
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190523@code.launchpad.net

Commit message

Update some of the install docs to include oops reqs

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:633
http://10.97.0.26:8080/job/dashboard-ci/197/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/197/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.install'
2--- README.install 2013-05-20 16:36:00 +0000
3+++ README.install 2013-10-11 03:14:28 +0000
4@@ -6,7 +6,9 @@
5 # backports
6 sudo apt-get install postgresql python-psycopg2 python-django \
7 python-django-south python-yaml django-tables \
8- python-django-auth-openid python-numpy python-mock
9+ python-django-auth-openid python-numpy python-mock python-oops \
10+ python-oops-wsgi python-oops-datedir-repo python-oops-amqp \
11+ python-oops-dictconfig
12
13 # Set up the database
14 sudo vi /etc/postgresql/9.1/main/pg_hba.conf
15
16=== modified file 'deployment/apache-mod-wsgi/README'
17--- deployment/apache-mod-wsgi/README 2013-04-29 23:38:40 +0000
18+++ deployment/apache-mod-wsgi/README 2013-10-11 03:14:28 +0000
19@@ -1,9 +1,10 @@
20 # Fri 17 Aug 2012 11:19:28 AM EDT Joe Talbott <joe.talbott@canonical.com>
21 # This is for setting up a production like environment.
22 ###
23-### Install apache and mod-wsgi
24+### Install apache and mod-wsgi and oops reqirements
25 ###
26-sudo apt-get install apache2 libapache2-mod-wsgi
27+sudo apt-get install apache2 libapache2-mod-wsgi python-oops python-oops-wsgi \
28+python-oops-datedir-repo python-oops-amqp python-oops-dictconfig
29
30 ###
31 ### Create the apache document root tree
32@@ -14,7 +15,7 @@
33
34 ###
35 sudo mkdir -p $INSTALL_DIR/{media,scripts,static}
36-
37+sudo mkdir $REPO_DIR/oops-local
38 ###
39 ### Branch the code
40 ###
41@@ -46,12 +47,12 @@
42
43 DATABASES = {
44 'default': {
45- 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
46- 'NAME': 'qa_dashboard', # Or path to database file if using sqlite3.
47- 'USER': 'qa_user', # Not used with sqlite3.
48- 'PASSWORD': 'qa_pass', # Not used with sqlite3.
49- 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3.
50- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
51+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
52+ 'NAME': 'qa_dashboard',
53+ 'USER': 'qa_user',
54+ 'PASSWORD': 'qa_pass',
55+ 'HOST': 'localhost',
56+ 'PORT': '',
57 }
58 }
59

Subscribers

People subscribed via source and target branches