porting ansible config to xenial

no more upstart, switch to daemontools, among other things

vagrant/README.rst

@@ -24,27 +24,27 @@ the brozzler virtualenv.
 ::
 
     my-laptop$ vagrant ssh
-    vagrant@brzl:~$ source /opt/brozzler-ve34/bin/activate
-    (brozzler-ve34)vagrant@brzl:~$
+    vagrant@brzl:~$ source /opt/brozzler-ve3/bin/activate
+    (brozzler-ve3)vagrant@brzl:~$
 
 Then you can run brozzler-new-site:
 
 ::
 
-    (brozzler-ve34)vagrant@brzl:~$ brozzler-new-site --proxy=localhost:8000 http://example.com/
+    (brozzler-ve3)vagrant@brzl:~$ brozzler-new-site --proxy=localhost:8000 http://example.com/
 
 
 Or brozzler-new-job (make sure to set the proxy to localhost:8000):
 
 ::
 
-    (brozzler-ve34)vagrant@brzl:~$ cat >job1.yml <<EOF
+    (brozzler-ve3)vagrant@brzl:~$ cat >job1.yml <<EOF
     id: job1
     proxy: localhost:8000 # point at warcprox for archiving
     seeds:
     - url: https://example.org/
     EOF
-    (brozzler-ve34)vagrant@brzl:~$ brozzler-new-job job1.yml
+    (brozzler-ve3)vagrant@brzl:~$ brozzler-new-job job1.yml
 
 WARC files will appear in ./warcs and brozzler, warcprox and rethinkdb logs in
 ./logs (via vagrant folders syncing).

vagrant/Vagrantfile

@@ -1,8 +1,9 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/xenial64"
   config.vm.define "10.9.9.9"
   config.vm.hostname = "brzl"
   config.vm.network :private_network, ip: "10.9.9.9"
+  config.disksize.size = '50GB'
 
   config.vm.synced_folder "..", "/brozzler"
 
@@ -14,6 +15,7 @@ Vagrant.configure(2) do |config|
   config.vm.provision "ansible" do |ansible|
     ansible.inventory_path = "../ansible/hosts-vagrant"
     ansible.playbook = "../ansible/playbook.yml"
+    # ansible.verbose = "-vvv"
   end
 
   config.vm.provider 'virtualbox' do |v|

vagrant/run-tests.sh

@@ -17,5 +17,5 @@ vagrant ssh -- 'status warcprox ;
                 status vnc-websock'
 echo
 
-vagrant ssh -- 'set -x ; source /opt/brozzler-ve34/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"'
-vagrant ssh -- "source /opt/brozzler-ve34/bin/activate && DISPLAY=:1 py.test -v /brozzler/tests $@"
+vagrant ssh -- 'set -x ; source /opt/brozzler-ve3/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"'
+vagrant ssh -- "source /opt/brozzler-ve3/bin/activate && DISPLAY=:1 py.test -v /brozzler/tests $@"

vagrant/vagrant-brozzler-new-job.py

@@ -7,7 +7,7 @@ This is a standalone script with no dependencies other than python, and should
 work with python 2.7 or python 3.2+. The only reason it's not a bash script is
 so we can use the argparse library.
 
-Copyright (C) 2016 Internet Archive
+Copyright (C) 2016-2019 Internet Archive
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,9 +41,8 @@ def main(argv=[]):
         subprocess.call([
             'vagrant', 'ssh', '--',
             'f=`mktemp` && cat > $f && '
-            'PYTHONPATH=/home/vagrant/brozzler-ve34/lib/python3.4/site-packages '
-            '/home/vagrant/brozzler-ve34/bin/python '
-            '/home/vagrant/brozzler-ve34/bin/brozzler-new-job $f'],
+            '/home/vagrant/brozzler-ve3/bin/python '
+            '/home/vagrant/brozzler-ve3/bin/brozzler-new-job $f'],
             stdin=f)
 
 if __name__ == '__main__':

vagrant/vagrant-brozzler-new-site.py

@@ -74,11 +74,9 @@ def main(argv=[]):
     os.chdir(os.path.dirname(__file__))
 
     cmd = (
-        'PYTHONPATH=/home/vagrant/brozzler-ve34/lib/python3.4/site-packages '
-        '/home/vagrant/brozzler-ve34/bin/python '
-        '/home/vagrant/brozzler-ve34/bin/brozzler-new-site '
-        '--proxy=localhost:8000 %s %s') % (
-                ' '.join(options), args.seed)
+        '/home/vagrant/brozzler-ve3/bin/python '
+        '/home/vagrant/brozzler-ve3/bin/brozzler-new-site '
+        '--proxy=localhost:8000 %s %s') % (' '.join(options), args.seed)
     subprocess.call(['vagrant', 'ssh', '--', cmd])
 
 if __name__ == '__main__':