diff --git a/setup.py b/setup.py index ca81d44..ec6d2fa 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ import setuptools setuptools.setup( name='brozzler', - version='1.1.dev44', + version='1.1.dev45', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt', diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index c4eab85..820c7fa 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -2,6 +2,8 @@ Vagrant.configure(2) do |config| config.vm.box = "ubuntu/trusty64" config.vm.hostname = "brozzler-easy" + config.vm.synced_folder "..", "/brozzler" + config.vm.provision "ansible" do |ansible| ansible.playbook = "ansible/playbook.yml" ansible.groups = { diff --git a/vagrant/ansible/roles/brozzler-worker/tasks/main.yml b/vagrant/ansible/roles/brozzler-worker/tasks/main.yml index f2a4e23..c514cf4 100644 --- a/vagrant/ansible/roles/brozzler-worker/tasks/main.yml +++ b/vagrant/ansible/roles/brozzler-worker/tasks/main.yml @@ -46,7 +46,8 @@ - restart vnc-websock - name: install brozzler in virtualenv become: true - pip: name=git+https://github.com/internetarchive/brozzler.git#egg=brozzler + pip: # name=git+https://github.com/internetarchive/brozzler.git#egg=brozzler + name='-e /brozzler' virtualenv=/home/vagrant/brozzler-ve34 virtualenv_python=python3.4 extra_args='--no-input --upgrade --pre' diff --git a/vagrant/ansible/roles/rethinkdb/tasks/main.yml b/vagrant/ansible/roles/rethinkdb/tasks/main.yml index 7083a14..77bbb89 100644 --- a/vagrant/ansible/roles/rethinkdb/tasks/main.yml +++ b/vagrant/ansible/roles/rethinkdb/tasks/main.yml @@ -11,6 +11,8 @@ become: true notify: - restart rethinkdb +- name: ensure rethinkdb starts on reboot + service: name=rethinkdb enabled=yes - name: ensure rethinkdb instance config file is installed template: src=templates/rethinkdb-brozzler-easy.conf.j2 dest=/etc/rethinkdb/instances.d/rethinkdb-brozzler-easy.conf