diff --git a/colab/settings.py b/colab/settings.py index 1402680..0ae4cdb 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -8,7 +8,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.7/ref/settings/ """ -BROKER_URL = 'amqp://guest:guest@localhost:5672/' +BROKER_URL = 'redis://localhost:6379/0' +CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os diff --git a/setup.py b/setup.py index bed0fe5..13b4417 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ REQUIREMENTS = [ 'diazo>=1.0.5', # Async Signals - 'celery>=3.1', + 'celery[redis]>=3.1', ### Move out of colab (as plugins): diff --git a/vagrant/centos.sh b/vagrant/centos.sh index 1d4b86c..61ae150 100755 --- a/vagrant/centos.sh +++ b/vagrant/centos.sh @@ -22,9 +22,9 @@ yum install -y epel-release yum -y groupinstall "Development tools" -yum install -y git unzip gettext libxml2-devel libxslt-devel openssl-devel libffi-devel python-devel python-pip python-virtualenvwrapper rabbitmq-server +yum install -y git unzip gettext libxml2-devel libxslt-devel openssl-devel libffi-devel python-devel python-pip python-virtualenvwrapper redis-server ### Init Rabbitmq -chkconfig rabbitmq-server on -systemctl start rabbitmq-server +chkconfig redis-server on +systemctl start redis-server diff --git a/vagrant/ubuntu.sh b/vagrant/ubuntu.sh index 9df2a97..f145a58 100755 --- a/vagrant/ubuntu.sh +++ b/vagrant/ubuntu.sh @@ -5,4 +5,4 @@ set -ex ### Install dependencies apt-get update -apt-get install curl git unzip build-essential gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev python-dev virtualenvwrapper python-pip rabbitmq-server -y +apt-get install curl git unzip build-essential gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev python-dev virtualenvwrapper python-pip redis-server -y -- libgit2 0.21.2