Merge lp:~ricardokirkner/locolander/fix-deploy into lp:locolander

[Ricardo Kirkner]

various fixes for real deployment issues

Unmerged revisions

37. By Ricardo Kirkner on 2013-08-11

fixes to supervisor config

36. By Ricardo Kirkner on 2013-08-11

use proper path to locolander script

35. By Ricardo Kirkner on 2013-08-11

avoid bzr diff aborting locolander script

34. By Ricardo Kirkner on 2013-07-29

better output from script

33. By Ricardo Kirkner on 2013-07-29

replace subprocess with envoy

use envoy instead of subprocess, because the latter fails to run properly
when celeryd is started under supervisor.

32. By Ricardo Kirkner on 2013-07-29

customized model repr strings

31. By Ricardo Kirkner on 2013-07-29

use absolute path for database file

30. By Ricardo Kirkner on 2013-07-29

better output handling

29. By Ricardo Kirkner on 2013-07-29

disable autoreload

28. By Ricardo Kirkner on 2013-07-29

added envoy and django-supervisor as dependencies

=== modified file 'docker/scripts/locolander'
--- docker/scripts/locolander	2013-08-16 23:23:30 +0000
+++ docker/scripts/locolander	2013-08-16 23:23:30 +0000
@@ -33,6 +33,9 @@
 cd target
 OUTPUT=$(bzr merge $SOURCE 2>&1)
 
+# ignore any errors here as bzr diff will exit with code 1
+# if the diff is not empty
+set +e
 # figure out if there are any changes
 DIFF=$(bzr diff)
 CONFLICTS=$(bzr conflicts)
@@ -47,6 +50,7 @@
     echo "SUCCESS - Nothing to do."
     exit 0
 fi
+set -e
 
 # 3. build image using config file
 echo "Building project image..."

=== modified file 'fabfile.py'
--- fabfile.py	2013-08-16 23:23:30 +0000
+++ fabfile.py	2013-08-16 23:23:30 +0000
@@ -24,7 +24,7 @@
 
 @virtualenv
 def run():
-    manage('supervisor')
+    manage('supervisor -d')
 
 
 @virtualenv

=== modified file 'locolander/locolanderweb/tasks.py'
--- locolander/locolanderweb/tasks.py	2013-08-16 23:23:30 +0000
+++ locolander/locolanderweb/tasks.py	2013-08-16 23:23:30 +0000
@@ -3,7 +3,6 @@
 import subprocess
 from datetime import datetime
 =======
-from datetime import datetime
 >>>>>>> MERGE-SOURCE
 
 import envoy
@@ -26,11 +25,12 @@
     author = request.author
     message = request.commit_message
 
+    cwd = os.path.dirname(os.path.abspath(__file__))
+    script = os.path.abspath(os.path.join(cwd, '..', '..',
+                                          'docker', 'scripts', 'locolander'))
     cmd = '{script} {project} {source} {target} "{message}" "{author}"'.format(
-        script=os.path.join(os.path.abspath(os.curdir),
-                            'docker', 'scripts', 'locolander'),
-        project=project.name, source=source, target=target, message=message,
-        author=author)
+        script=script, project=project.name, source=source, target=target,
+        message=message, author=author)
 
     r = envoy.run(cmd)
     output = r.std_out

=== modified file 'locolander/supervisord.conf'
--- locolander/supervisord.conf	2013-08-16 23:23:30 +0000
+++ locolander/supervisord.conf	2013-08-16 23:23:30 +0000
@@ -1,6 +1,5 @@
 [program:gunicorn]
-command = gunicorn -b 0.0.0.0:8000 locolander.wsgi:application
-directory = {{ PROJECT_DIR }}
+command = gunicorn locolander.wsgi:application
 autostart = true
 autorestart = true
 stdout_logfile = supervisord.log
@@ -8,7 +7,7 @@
 
 [program:redis]
 command = redis-server
-autostart = true
+autostart = false
 autorestart = true
 stdout_logfile = supervisord.log
 redirect_stderr = true
@@ -22,7 +21,7 @@
 
 [program:flower]
 command = {{ PYTHON }} {{ PROJECT_DIR }}/manage.py celery flower
-autostart = true
+autostart = false
 autorestart = true
 stdout_logfile = supervisord.log
 redirect_stderr = true