Changeset caed8ed in adblock2privoxy


Ignore:
Timestamp:
Jan 4, 2015 3:59:43 AM (5 years ago)
Author:
zubr <a@…>
Branches:
master
Children:
18729f8
Parents:
ff7ee56
Message:

Release preparation

Location:
adblock2privoxy
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • adblock2privoxy/distribution/rpmbuild/SPECS/adblock2privoxy.spec

    rb4685e7 rcaed8ed  
    6060 
    6161%files 
    62 %doc LICENSE README.rst changelog man/man1/adblock2privoxy.1 
     62%doc LICENSE README.rst INSTALL.rst changelog man/man1/adblock2privoxy.1 
    6363%{_bindir}/%{name} 
    6464%{_datadir}/%{name}-%{version} 
     
    6666 
    6767%changelog 
    68 * Thu Jan 01 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.0 
     68* Sat Jan 03 2015 Alexey Zubritskiy <adblock2privoxy@zubr.me> - 1.3.0 
    6969- Rpm release for new version (generated from cabal file) 
  • adblock2privoxy/man/man1/adblock2privoxy.1

    r828fba4 rcaed8ed  
    1 .TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-01" "adblock2privoxy 1.3.0" "General Commands Manual" 
     1.TH "ADBLOCK2PRIVOXY" "1" "2015\-01\-03" "adblock2privoxy 1.3.0" "General Commands Manual" 
    22.SH ADBLOCK2PRIVOXY 
    33.PP 
     
    4545.PP 
    4646Tested with privoxy version 3.0.21. 
    47 Element blocking feature requires a webserver to serve CSS files. 
     47Element hiding feature requires a webserver to serve CSS files. 
    4848See Nginx and Apache config examples provided. 
    4949.SS Description 
     
    6060.RS 
    6161.TP 
    62 .B \-v, \-\-version 
    63 show version number 
    64 .RS 
    65 .RE 
    66 .TP 
    67 .B \-p PATH, \-\-privoxyDir=PATH 
    68 privoxy config output path (required) 
    69 .RS 
    70 .RE 
    71 .TP 
    72 .B \-w PATH, \-\-webDir=PATH 
    73 css files output path (optional, privoxyDir is used by default) 
    74 .RS 
    75 .RE 
    76 .TP 
    77 .B \-t PATH, \-\-taskFile=PATH 
    78 path to task file containing urls to process 
    79 .RS 
    80 .RE 
    81 .TP 
    82 .B \-f, \-\-forced 
    83 run even if no sources are expired 
    84 .RS 
    85 .RE 
    86 .RE 
     62.B \-v \-\-version 
     63Show version number 
     64.RS 
     65.RE 
     66.TP 
     67.B \-p PATH \-\-privoxyDir=PATH 
     68Privoxy config output path 
     69.RS 
     70.RE 
     71.TP 
     72.B \-w PATH \-\-webDir=PATH 
     73Css files output path 
     74.RS 
     75.RE 
     76.TP 
     77.B \-d DOMAIN \-\-domainCSS=DOMAIN 
     78Domain of CSS web server (required for Element Hide functionality) 
     79.RS 
     80.RE 
     81.TP 
     82.B \-t PATH \-\-taskFile=PATH 
     83Path to task file containing urls to process and options. 
     84.RS 
     85.RE 
     86.TP 
     87.B \-f \-\-forced 
     88Run even if no sources are expired 
     89.RS 
     90.RE 
     91.RE 
     92.PP 
     93If taskFile is not specified explicilty, [privoxyDir]/ab2p.task is used. 
     94.PP 
     95If task file exists and privoxyDir, webDir or domainCSS is not 
     96specified, corresponding value is taken from task file. 
     97.PP 
     98If webDir is not specified (and cannot be taken from task file), 
     99privoxyDir value is used for webDir. 
     100.PP 
     101If domainCSS is not specified (and cannot be taken from task file), 
     102Element Hide functionality become disabled (and no webserver is needed). 
     103.PP 
     104domainCSS can contain just IP address if no CSS web server has no 
     105associated domain. 
    87106.SS Usage 
    88107.PP 
     
    91110.nf 
    92111\f[C] 
    93 adblock2privoxy\ \-p\ /etc/privoxy\ \-w\ /var/www/privoxy\ \-t\ my_ab2b.task\ https://easylist\-downloads.adblockplus.org/easylist.txt\ https://easylist\-downloads.adblockplus.org/advblock.txt\ my_custom.txt 
     112adblock2privoxy\ \-p\ /etc/privoxy\ \-w\ /var/www/privoxy\ \-d\ www.example.com\ \-t\ my_ab2b.task\ https://easylist\-downloads.adblockplus.org/easylist.txt\ https://easylist\-downloads.adblockplus.org/advblock.txt\ my_custom.txt 
    94113\f[] 
    95114.fi 
     
    99118.nf 
    100119\f[C] 
    101 adblock2privoxy\ \-p\ /etc/privoxy\ \-w\ /var/www/privoxy\ \-t\ my_ab2b.task 
     120adblock2privoxy\ \-t\ my_ab2b.task 
    102121\f[] 
    103122.fi 
     
    125144ab2p.css 
    126145.IP \[bu] 2 
    127 [lot of directories for first level domain names] 
     146[lot of directories for all levels of domain names] 
    128147.RE 
    129148.IP \[bu] 2 
     
    133152.IP \[bu] 2 
    134153special file containing execution details. 
    135 It can be reused to update privoxy config from same sources. 
     154It can be reused to update privoxy config from same sources with same 
     155options. 
    136156.RE 
    137157.SS How to apply results 
     
    163183server\ { 
    164184\ \ \ \ \ \ \ \ listen\ 80; 
    165 \ \ \ \ \ \ \ \ #ab2p\ css\ domain\ name\ (optional) 
    166 \ \ \ \ \ \ \ \ server_name\ privoxy.zubr.me; 
     185\ \ \ \ \ \ \ \ #ab2p\ css\ domain\ name\ (optional,\ should\ be\ equal\ to\ domainCSS\ parameter) 
     186\ \ \ \ \ \ \ \ server_name\ www.example.com; 
    167187 
    168188\ \ \ \ \ \ \ \ #root\ =\ webDir\ parameter\ value\  
     
    188208\f[C] 
    189209<VirtualHost\ *:80> 
    190 \ \ \ \ \ \ \ \ #ab2p\ css\ domain\ name\ (optional) 
     210\ \ \ \ \ \ \ \ #ab2p\ css\ domain\ name\ (optional,\ should\ be\ equal\ to\ domainCSS\ parameter) 
    191211\ \ \ \ \ \ \ \ ServerName\ www.example.com\  
    192212 
     
    218238.RE 
    219239.IP "5)" 3 
    220 Run adblock2privoxy providing privoxy dir, web dir and adblock input 
    221 file urls 
     240Run adblock2privoxy providing privoxy dir, web dir, domain and adblock 
     241input file urls 
    222242.IP "6)" 3 
    223243Restart privoxy and apache to load updated configs 
Note: See TracChangeset for help on using the changeset viewer.