diff --git a/.travis.yml b/.travis.yml index 6d8b256..aa532e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python python: - "2.7" env: - - DJANGO=1.7.7 + - DJANGO=1.8 install: - pip install -r dev/requirements.txt --use-mirrors script: diff --git a/Vagrantfile b/Vagrantfile index db8a8bf..d1a855c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,7 +3,7 @@ Vagrant.configure(2) do |config| config.vm.box = "chef/ubuntu-14.04" - config.vm.hostname = "webvirtmgr" + config.vm.hostname = "webvirtcloud" config.vm.network "private_network", ip: "192.168.33.10" config.vm.provision "shell", inline: <<-SHELL sudo sh /vagrant/dev/libvirt-bootstrap.sh diff --git a/conf/supervisor/webvirtcloud.conf b/conf/supervisor/webvirtcloud.conf index 6fc32b0..0a9f240 100644 --- a/conf/supervisor/webvirtcloud.conf +++ b/conf/supervisor/webvirtcloud.conf @@ -1,17 +1,15 @@ [program:webvirtcloud] -command=/usr/bin/python /var/www/webvirtcloud/manage.py run_gunicorn -c /var/www/webvirtcloud/conf/gunicorn.conf.py +command=/usr/local/bin/gunicorn webvirtcloud.wsgi:application -c /var/www/webvirtcloud/gunicorn.conf.py directory=/var/www/webvirtcloud +user=www-data autostart=true autorestart=true -stdout_logfile=/var/log/supervisor/webvirtcloud.log redirect_stderr=true -user=www-data -[program:consoled] -command=/usr/bin/python /var/www/webvirtcloud/console/consoled +[program:novncd] +command=/usr/bin/python /var/www/webvirtcloud/console/novncd directory=/var/www/webvirtcloud +user=www-data autostart=true autorestart=true -stdout_logfile=/var/log/supervisor/consoled.log -redirect_stderr=true -user=www-data +redirect_stderr=true \ No newline at end of file diff --git a/console/consoled b/console/novncd similarity index 100% rename from console/consoled rename to console/novncd diff --git a/dev/requirements.txt b/dev/requirements.txt index 14d220c..580a55c 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,5 +1,4 @@ -Django==1.8 -websockify==0.6.0 +-r ../requirements.txt pep8==1.6.2 pyflakes==0.8.1 pylint==1.4.3 \ No newline at end of file diff --git a/webvirtcloud/gunicorn.conf.py b/gunicorn.conf.py similarity index 100% rename from webvirtcloud/gunicorn.conf.py rename to gunicorn.conf.py diff --git a/conf/requirements.txt b/requirements.txt similarity index 63% rename from conf/requirements.txt rename to requirements.txt index fcae85c..e107b2b 100644 --- a/conf/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ Django==1.8 websockify==0.6.0 -gunicorn==19.3.0 +gunicorn==19.3.0 \ No newline at end of file