Tweak config for deployment.

Author: onyxfish

config/deployed/nginx

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name crime.hacktyler.com;
+    server_name sirens.hacktyler.com;
 
     client_max_body_size 1G;
 

config/deployed/settings.py

@@ -9,10 +9,10 @@
 DATABASES['default']['PORT'] = '5433'
 
 # Static media
-STATIC_ROOT = '/mnt/media'
+STATIC_ROOT = '/mnt/media/hacktyler_crime'
 
 # Uploads 
-MEDIA_ROOT = '/mnt/uploads' 
+MEDIA_ROOT = '/mnt/uploads/hacktyler_crime' 
 
 # Caching
 CACHES = {

fabfile.py

@@ -54,7 +54,7 @@ def setup():
     install_requirements()
     destroy_database()
     create_database()
-    load_data()
+    syncdb()
     install_server_conf()
     collect_static_files()
     reload_app();
@@ -64,6 +64,8 @@ def setup_directories():
     Create directories necessary for deployment.
     """
     run('mkdir -p %(path)s' % env)
+    sudo('mkdir -p /var/log/sites/%(project_name)s/' % env, user='uwsgi')
+    sudo('touch /var/log/sites/hacktyler_crime/hacktyler_crime.log', user='uwsgi')
 
 def setup_virtualenv():
     """
@@ -88,14 +90,14 @@ def install_requirements():
     """
     Install the required packages using pip.
     """
-    run('source %(env_path)s/bin/activate; pip install -q -r %(repo_path)s/requirements.txt' % env)
+    run('source %(env_path)s/bin/activate; pip install -r %(repo_path)s/requirements.txt' % env)
 
 def install_server_conf():
     """
     Install the server config file.
     """
-    sudo('ln -s %(repo_path)s/config/%(settings)s/nginx %(server_config_path)s' % env)
-    sudo('ln -s %(repo_path)s/config/%(settings)s/uwsgi.conf /etc/init.d/%(project_name)s.conf' % env)
+    sudo('ln -s %(repo_path)s/config/deployed/nginx %(server_config_path)s' % env)
+    sudo('ln -s %(repo_path)s/config/deployed/uwsgi.conf /etc/init/%(project_name)s.conf' % env)
     sudo('initctl reload-configuration' % env)
 
 """
@@ -123,7 +125,7 @@ def reload_app():
     """
     Restart the uwsgi server.
     """
-    sudo('service %(project)s restart' % env)
+    sudo('service %(project_name)s restart' % env)
 
 def update_requirements():
     """
@@ -149,7 +151,7 @@ def create_database():
     Creates the user and database for this project.
     """
     sudo('echo "CREATE USER %(project_name)s WITH PASSWORD \'%(database_password)s\';" | psql postgres' % env, user='postgres')
-    sudo('createdb -O %(project_name)s %(project_name)s' % env, user='postgres')
+    sudo('createdb -T template_postgis -O %(project_name)s %(project_name)s' % env, user='postgres')
 
 def destroy_database():
     """

requirements.txt

@@ -11,4 +11,4 @@ mock==0.7.2
 geopy==0.94.1
 git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie
 BeautifulSoup==3.2.0
-pusher==0.5
+-e git+https://github.com/onyxfish/pusher_client_python.git#egg=pusher

sirens/static/js/views/index.js

@@ -63,7 +63,7 @@ Sirens.views.Index = Backbone.View.extend({
 
     init_socket: function() {
         this.pusher = new Pusher("d20fddb74c58823cd05d");
-        this.channel = this.pusher.subscribe("active-calls");
+        this.channel = this.pusher.subscribe("presence-active-calls");
 
         this.channel.bind("pusher:subscription_succeeded", _.bind(function(members) {
             this.member_count = members.count;