Merge branch 'ARI-5294' into qa

.travis.yml

@@ -4,14 +4,12 @@ python:
 - 3.5
 - 3.6
 sudo: required
-dist: trusty
-group: deprecated-2017Q2  # https://blog.travis-ci.com/2017-06-21-trusty-updates-2017-Q2-launch
 before_install:
 - sudo pip install --upgrade setuptools pip
 - sudo pip install ansible==2.1.3.0
 install:
 - ansible-playbook --extra-vars="brozzler_pip_name=file://$TRAVIS_BUILD_DIR#egg=brozzler user=travis" --inventory-file=ansible/hosts-localhost ansible/playbook.yml
-- pip install $TRAVIS_BUILD_DIR 'warcprox>=2.1b1.dev87' pytest
+- pip install $TRAVIS_BUILD_DIR 'warcprox==2.3' pytest
 script:
 - DISPLAY=:1 py.test -v tests
 after_failure:

ansible/roles/warcprox/templates/warcprox.conf.j2

@@ -20,6 +20,6 @@ exec nice warcprox \
          --gzip \
          --rollover-idle-time=180 \
          --onion-tor-socks-proxy=localhost:9050 \
-         --rethinkdb-servers={{groups['rethinkdb']|join(',')}} \
-         --rethinkdb-db=brozzler \
-         --rethinkdb-big-table
+         --rethinkdb-services-url=rethinkdb://{{groups['rethinkdb']|join(',')}}/brozzler/services \
+         --rethinkdb-stats-url=rethinkdb://{{groups['rethinkdb']|join(',')}}/brozzler/stats \
+         --rethinkdb-big-table-url=rethinkdb://{{groups['rethinkdb']|join(',')}}/brozzler/captures

brozzler/behaviors.yaml

@@ -98,6 +98,12 @@
   default_parameters:
      click_css_selector: .bigBtnPlay
      click_until_hard_timeout: False
+- # https://webarchive.jira.com/browse/ARI-5294
+  url_regex: '^https?://citymedfordwi\.civicweb\.net/.*$'
+  behavior_js_template: simpleclicks.js.j2
+  default_parameters:
+     click_css_selector: div.meeting-document-type-buttons button.button-small
+     click_until_hard_timeout: False
   request_idle_timeout_sec: 10
 - # https://webarchive.jira.com/browse/ARI-5409
   url_regex: '^https?://(?:www\.)?tuebingen.de/.*$'