Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-09-26 11:11:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ARI-5294' into qa

Browse source
This commit is contained in:
Barbara Miller 2017-12-19 11:04:09 -08:00
commit 906c76ce2d
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

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

6
ansible/roles/warcprox/templates/warcprox.conf.j2
View file

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

6
brozzler/behaviors.yaml
View file

@ -98,6 +98,12 @@
default_parameters: default_parameters:
click_css_selector: .bigBtnPlay click_css_selector: .bigBtnPlay
click_until_hard_timeout: False 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 request_idle_timeout_sec: 10
- # https://webarchive.jira.com/browse/ARI-5409 - # https://webarchive.jira.com/browse/ARI-5409
url_regex: '^https?://(?:www\.)?tuebingen.de/.*$' url_regex: '^https?://(?:www\.)?tuebingen.de/.*$'