From 496babaebb76fcb5944b4bee55ed450bd872cbaa Mon Sep 17 00:00:00 2001 From: swozny Date: Thu, 23 Feb 2017 21:03:25 +0100 Subject: [PATCH 1/2] Fix set up problems --- .gitignore | 9 ++++- Vagrantfile | 2 +- requirements.txt | 75 +++++++++++++++++++++++++++-------- settings/vagrant/bootstrap.sh | 7 +++- settings/vagrant/deploy.sh | 1 - settings/vagrant/start.sh | 0 6 files changed, 72 insertions(+), 22 deletions(-) mode change 100644 => 100755 settings/vagrant/start.sh diff --git a/.gitignore b/.gitignore index 85474acb..9aba06aa 100755 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,11 @@ media .idea serve whoosh_index -static/doc \ No newline at end of file +static/doc +/.vagrant/machines/default/virtualbox/index_uuid +/.vagrant/machines/default/virtualbox/action_set_name +/.vagrant/machines/default/virtualbox/id +/.vagrant/machines/default/virtualbox/creator_uid +/.vagrant/machines/default/virtualbox/action_provision +/.vagrant/machines/default/virtualbox/synced_folders +/.vagrant/machines/default/virtualbox/private_key diff --git a/Vagrantfile b/Vagrantfile index 4e380a60..b69592c0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -22,7 +22,7 @@ Vagrant.configure(2) do |config| config.vm.provision :shell, :path => "settings/vagrant/postgres.sh" config.vm.provision :shell, :path => "settings/vagrant/deploy.sh" config.vm.provision :shell, :path => "settings/vagrant/start.sh",run: "always" - config.vm.network "forwarded_port", guest: 8000, host: 8005 + config.vm.network "forwarded_port", guest: 8000, host: 8006 # Disable automatic box update checking. If you disable this, then # boxes will only be checked for updates when the user runs diff --git a/requirements.txt b/requirements.txt index 6e738cb7..e0e90980 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,26 @@ +Babel==1.3 +Django==1.7.3 +GnuPGInterface==0.3.2 +Jinja2==2.7.3 +MarkupSafe==0.23 +Pillow==2.6.1 +Pygments==2.0rc1 +Sphinx==1.3b1 +Twisted==16.5.0rc1 +Whoosh==2.6.0 amqp==1.4.6 anyjson==0.3.3 +apipkg==1.4 +apt-xapian-index==0.44 +argparse==1.2.1 asana==0.0.5 -billiard==3.3.0.19 -celery==3.1.17 -Django==1.7.1 +billiard==3.3.0.18 +celery==3.1.16 +ceres==0.10.0-rc1 +chardet==2.0.1 +command-not-found==0.2.44 +constantly==15.1.0 +distribute==0.6.24 django-angular==0.7.10 django-appconf==0.6 django-autoslug==1.7.2 @@ -12,41 +29,65 @@ django-celery==3.1.16 django-common==0.1.51 django-compressor==1.4 django-cors-headers==1.0.0 +django-debug-toolbar==1.6 django-debugtools==1.2.1 django-extra-views==0.6.5 django-form-utils==1.0.2 django-froala-editor==1.2.4 +django-gmapi==1.0.1 django-gunicorn==0.1.1 django-haystack==2.3.1 django-helper==0.8.4 django-kombu==0.9.4 django-libsass==0.2 -django-mail-queue==2.2.0 +django-mail-queue==2.1.2 django-mptt==0.6.1 django-notify==1.1.2 django-password-reset==0.7 django-reversion==1.8.5 -django-suit==0.2.12 +django-statsd-mozilla==0.3.16 +django-suit==0.2.11 django-suit-redactor==0.0.2 +djangorestframework==3.0.5 docutils==0.12 -gunicorn==19.1.1 +execnet==1.4.1 +gunicorn==18.0 html5lib==0.999 -Jinja2==2.7.3 -kombu==3.0.24 +incremental==16.10.0 +kombu==3.0.23 +language-selector==0.1 +libmagic==1.0 libsass==0.6.2 -MarkupSafe==0.23 -Pillow==2.6.1 -Pygments==2.0.1 +medusa==0.5.4 +meld3==0.6.5 +psycopg2==2.5.4 +py==1.4.31 pyparsing==2.0.3 +pytest==3.0.3 +pytest-django==3.0.0 +pytest-xdist==1.15.0 +python-apt==0.8.3ubuntu7 python-dateutil==2.3 +python-debian==0.1.21ubuntu1 python-magic==0.4.6 python-memcached==1.53 -python-ptrace==0.8.1 -pytz==2014.10 +python-ptrace==0.8 +pytz==2014.7 requests==2.5.1 -six==1.8.0 -sorl-thumbnail==12.2 -Sphinx==1.2.3 +six==1.5.2 +snowballstemmer==1.2.0 +sorl-thumbnail==11.12.1b +sqlparse==0.2.1 +statsd==2.1.2 suit==2.0.2 -Whoosh==2.6.0 +supervisor==3.0a8 +threadpool==1.2.7 +txAMQP==0.6.2 +ufw==0.31.1-1 +whisper==0.9.15 +wsgiref==0.1.2 xlwt==0.7.5 +zope.interface==4.3.2 + + + diff --git a/settings/vagrant/bootstrap.sh b/settings/vagrant/bootstrap.sh index 43a043a2..082b24ab 100644 --- a/settings/vagrant/bootstrap.sh +++ b/settings/vagrant/bootstrap.sh @@ -2,8 +2,11 @@ sudo apt-get -y update sudo apt-get -y install postgresql-server-dev-9.1 postgresql-9.1 postgresql-contrib-9.1 sudo apt-get -y install nginx memcached python-pip libjpeg-dev -sudo apt-get -y install python-dev g++ vim supervisor +sudo apt-get -y install python-dev g++ vim supervisor libffi-dev sudo pip install gunicorn psycopg2 python-memcached pytest-django pytest-xdist -sudo pip install -r /vagrant/requirements.txt sudo pip install django-debug-toolbar django-statsd-mozilla https://github.com/graphite-project/ceres/tarball/master whisper carbon graphite-web +sudo pip install -r /vagrant/requirements.txt +sudo apt-get install npm -y +sudo npm config set registry http://registry.npmjs.org/ +sudo npm install -g coffee-script diff --git a/settings/vagrant/deploy.sh b/settings/vagrant/deploy.sh index 7ee4c5b1..a09fac37 100644 --- a/settings/vagrant/deploy.sh +++ b/settings/vagrant/deploy.sh @@ -9,5 +9,4 @@ sudo ln -s /vagrant/settings/etc/nginx.conf /etc/nginx/sites-enabled/default -f sudo service nginx start sudo nginx -s reload cd /vagrant -fab remove_migrations diff --git a/settings/vagrant/start.sh b/settings/vagrant/start.sh old mode 100644 new mode 100755 From 54ad7102d1f1fc082f07b0595f946ff36124189f Mon Sep 17 00:00:00 2001 From: swozny Date: Thu, 23 Feb 2017 21:21:46 +0100 Subject: [PATCH 2/2] Fix set up problems --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 1294518c..8d9e69ae 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,16 @@ # EESTECNET +## Set up +Execute: + + vagrant up + vagrant halt && vagrant up && vagrant ssh +In vagrant: + + cd /var/www/eestecnet + python manage.py runserver 0.0.0.0:8000 + +eestecnet will run on `localhost:8006` ## Motivation The motivation for creating this open source project is to provide an online platform for the