mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 00:03:28 +01:00
f07d35709a
* embargo: add support for per-collection date range embargo with embargo options of 'before', 'after', 'newer' and 'older' 'before' and 'after' accept a timestamp 'newer' and 'older' options configured with a dictionary consisting of any combo of 'years', 'months', 'days' add basic test for each embargo option * acl/embargo work: - support acl access value 'allow_ignore_embargo' for overriding embargo - support 'user' in acl setting, matched with value of 'X-Pywb-ACL-User' header - support passing through 'X-Pywb-ACL-User' setting to warcserver - aclmanager: support -u/--user param for adding, removing and matching rules - tests: add test for 'allow_ignore_embargo', user-specific acl rule matching * docs: add docs for new embargo system! * docs: add info on how to configure ACL header with short examples to usage page. sample-deploy: add examples of configuring X-pywb-ACL-user header based on IP for nginx and apache sample deployments * docs: fix access control page header, text tweaks * bump version to 2.6.0b0
27 lines
702 B
Plaintext
27 lines
702 B
Plaintext
<VirtualHost *:80>
|
|
# optional: optimization to have apache serve static assets
|
|
Alias /wayback/static "/pywb/pywb/static"
|
|
ProxyPass /wayback/static !
|
|
|
|
<Directory "/pywb/pywb/static">
|
|
Options None
|
|
AllowOverride None
|
|
Order allow,deny
|
|
Allow from all
|
|
Require all granted
|
|
</Directory>
|
|
|
|
# required: proxy pass to pywb
|
|
ProxyPass /wayback uwsgi://pywb:8081/
|
|
|
|
# optional: set custom header based on IP ranges
|
|
<If "-R '192.168.1.0/24' || -R '127.0.0.1'">
|
|
RequestHeader set X-Pywb-ACL-User staff
|
|
</If>
|
|
# ensure header is cleared if no match
|
|
<Else>
|
|
RequestHeader set X-Pywb-ACL-User ""
|
|
</Else>
|
|
|
|
</VirtualHost>
|