Merge lp:~salgado/offspring/trivialities into lp:offspring

[Guilherme Salgado]

Some doc updates and a small change to config/offspring-web.wsgi so that we don't need to change the same thing in multiple places when developing

[Cody A.W. Somerville (cody-somerville)]

Looks good. Please feel free to go ahead and land.

review: Approve

[Guilherme Salgado (salgado)]

I can't merge it as I'm not a member of the "Offspring hackers" team.

[Michael Hudson-Doyle (mwhudson)]

I don't think you meant to commit the addition of the builds directory? How did you manage that anyway? It's in .bzrignore. I can merge this once you've done that though.

[Guilherme Salgado (salgado)]

I bzr added the builds directory because 'make' fails without it. Maybe
I should've changed the build scripts to create it instead?

[Michael Hudson-Doyle (mwhudson)]

On Thu, 01 Sep 2011 00:01:39 -0000, Guilherme Salgado <email address hidden> wrote:
> I bzr added the builds directory because 'make' fails without it. Maybe
> I should've changed the build scripts to create it instead?

Hm I don't really remember how this works. But I'm fairly sure that in
production builds is a symlink so that trying to pull this branch over
the top will fail...

Cheers,
mwh

[Cody A.W. Somerville (cody-somerville)]

Makefile should be fixed. '[ -d builds ] && chmod -r builds' should be changed to something like 'chmod -r builds 2> /dev/null || true' or '[ ! -d builds ] || chmod -r builds'. The call to restore read permissions should be changed in a similar fashion.

For those curious why we do this, it is a hack to prevent distutils from transversing and accessing every single file underneath builds when we run setup.py. Although not problematic on a devel instance, it takes a significant amount of time in production where there are tons of files.

[Guilherme Salgado (salgado)]

I've fixed the Makefile as you suggested, Cody.

[lp:~salgado/offspring/trivialities]

81. By Guilherme Salgado on 2011-09-01

Fix the Makefile to not crash when there's no 'builds' directory and 'bzr rm' the builds directory I added in the previous commit

[Guilherme Salgado (salgado)]

Hi Cody,

Is this looking ok now? Would you mind landing it for me?

Cheers

[Cody A.W. Somerville (cody-somerville)]

Looks good. Merging.

=== modified file 'Makefile'
--- Makefile	2011-08-11 00:13:54 +0000
+++ Makefile	2011-09-01 14:45:24 +0000
@@ -15,9 +15,9 @@
 	# XXX: Remove read permission from builds directory while running 
 	# setup.py to prevent distutils from transversing and accessing every
 	# single file underneath it. Restore read permissions once completed.
-	[ -d builds ] && chmod -r builds
+	[ ! -d builds ] || chmod -r builds
 	./.virtualenv/bin/python setup.py develop --script-dir=./bin/
-	[ -d builds ] && chmod +r builds
+	[ ! -d builds ] || chmod +r builds
 	[ -f bin/offspring-build ] || ln -s `pwd`/lib/offspring/build/bin/* bin/
 	mkdir -p logs
 	mkdir -p scripts && ln -s --force `pwd`/lib/offspring/build/scripts/* scripts/

=== modified file 'config/offspring-web.wsgi'
--- config/offspring-web.wsgi	2011-08-11 00:16:09 +0000
+++ config/offspring-web.wsgi	2011-09-01 14:45:24 +0000
@@ -6,13 +6,15 @@
 
 ## CONFIGURABLE OPTIONS
 
+DEPLOY_ROOT = '/srv'
+
 # Directories to add to sys.path
 # ex. ['srv/.virtualenv/lib/python2.5/dist-packages']
-ALLDIRS = ['srv/.virtualenv/lib/python2.6/site-packages']
+ALLDIRS = ['%s/.virtualenv/lib/python2.6/site-packages' % DEPLOY_ROOT]
 
 # Offspring Config File
 # ex. '/srv/offspring/config/offspring.cfg'
-OFFSPRING_CONFIGFILE='/srv/config/offspring.cfg'
+OFFSPRING_CONFIGFILE = '%s/config/offspring.cfg' % DEPLOY_ROOT
 
 # Django settings module to use
 # ex. 'offspring.web.settings_production'

=== modified file 'docs/INSTALL'
--- docs/INSTALL	2011-08-26 12:06:20 +0000
+++ docs/INSTALL	2011-09-01 14:45:24 +0000
@@ -56,6 +56,8 @@
  * libapache2-mod-wsgi
  * python-virtualenv
  * postgresql
+ * python2.6
+ * python2.6-dev
 
  2. Create the database.
 
@@ -76,11 +78,11 @@
  4. In the root of the installation (where the Makefile resides), execute
     'make web'.
 
- 5. Ppopulate the database.
+ 5. Populate the database.
 
 Replacing 'SETTINGS_MODULE' with the settings module you specified in
 config/offspring-web.wsgi, execute the following:
- bin/lexbuilder-web syncdb --settings=SETTINGS_MODULE
+ bin/offspring-web syncdb --settings=SETTINGS_MODULE
 
  6. Using config/offspring-web.apache as a template, create a site config
     file under '/etc/apache2/sites-available/' and then use 'a2ensite' to