# HG changeset patch # User Michael Granger # Date 1320884172 28800 # Node ID bf206815c2ab8eebba567d189f86f02992136ff5 # Parent 7b28fb383da2f33251d6d0ce5d85846f33618733 Whitespace consistency fixes diff -r 7b28fb383da2 -r bf206815c2ab README --- a/README Wed Nov 09 16:15:57 2011 -0800 +++ b/README Wed Nov 09 16:16:12 2011 -0800 @@ -36,12 +36,12 @@ You must enable url rewriting from within the squid.conf file. - url_rewrite_program /usr/local/bin/volta + url_rewrite_program /usr/local/bin/volta ... and that's it. You may need some additional customization, like where the volta database is stored on disk: - url_rewrite_program /usr/local/bin/volta -f /var/db/squid/volta.db + url_rewrite_program /usr/local/bin/volta -f /var/db/squid/volta.db Busy servers: @@ -50,8 +50,8 @@ up. A proxy at my $DAYJOB is in use by around 450 people, and we get by nicely with 10 volta children. - url_rewrite_concurrency 0 - url_rewrite_children 10 + url_rewrite_concurrency 0 + url_rewrite_children 10 Using volta @@ -62,7 +62,7 @@ Volta reads its rewrite rules from a local database. You can create the rules in a text editor, then convert it to the database like so: - % volta -c rules.txt + % volta -c rules.txt You'll be left with a "volta.db" file in the current directory. Put it wherever you please, and use the -f flag to point to it. @@ -102,11 +102,11 @@ Second field: the path to match. - This can be an exact match ('/path/to/something.html'), a regular - expression ('\.(jpg|gif|png)$'), or a single '*' to match for any - path. Regular expressions are matches without case sensitivity. There - is currently no support for capturing, though this may be added in - a future release. + This can be an exact match ('/path/to/something.html'), a regular + expression ('\.(jpg|gif|png)$'), or a single '*' to match for any + path. Regular expressions are matches without case sensitivity. There + is currently no support for capturing, though this may be added in a + future release. Third field: The redirect code and url to rewrite to. @@ -123,18 +123,18 @@ First field: the hostname to match. - See above -- all the same rules apply. + See above -- all the same rules apply. Second field: the path to match. - See above -- all the same rules apply. + See above -- all the same rules apply. - Third field: the 'negative' marker. + Third field: the 'negative' marker. - This is simply the '-' character, that signals to volta that this is - a negative matching rule. + This is simply the '-' character, that signals to volta that this is + a negative matching rule. You can easily test your rules by running volta on the command line, and @@ -148,24 +148,24 @@ google.com * 302:https://www.google.com - This will redirect the request "http://www.google.com/search?q=test" to - "https://www.google.com/search?q=test". + This will redirect the request "http://www.google.com/search?q=test" to + "https://www.google.com/search?q=test". Transparently alter all uploaded images on imgur to be my face: :) - i.imgur.com \.(gif|png|jpg)$ http://www.martini.nu/images/mahlon.jpg + i.imgur.com \.(gif|png|jpg)$ http://www.martini.nu/images/mahlon.jpg Expand a local, non qualified hostname to a FQDN (useful alongside the 'dns_defnames' squid setting to enforce browser proxy behaviors): - local-example * local-example.company.com + local-example * local-example.company.com Cause all blog content except for 2011 posts to permanently redirect to an archival page: - martini.nu /blog/2011 - - martini.nu /blog 301:martini.nu/content-archived.html + martini.nu /blog/2011 - + martini.nu /blog 301:martini.nu/content-archived.html