VERSION.do | 2 +- doc/certs.texi | 2 +- doc/install.texi | 2 +- doc/integrity.texi | 2 +- doc/restricted.texi | 2 +- doc/spies.texi | 2 +- doc/tlsauth.texi | 4 ++-- doc/usage.texi | 2 +- doc/warcs.texi | 8 ++++---- fifos/multitail | 24 ++++++++++++------------ makedist | 8 ++++---- state-init | 2 +- diff --git a/VERSION.do b/VERSION.do index 6bf787691099c009af23679b33c41da59cd8cbdfdbc4c7bf90085854ad89fc1a..75e97b5e7ece03f458248fbc06fb9b3656ed298712ecf135776068f81c711e5b 100644 --- a/VERSION.do +++ b/VERSION.do @@ -1,2 +1,2 @@ redo-ifchange version.go -perl -ne 'print "$1\n" if /Version.*"(.*)"$/' < version.go +perl -ne 'print "$1\n" if /Version.*"(.*)"$/' fifos/del-tls-auth +$ echo www.example.com >fifos/del-tls-auth @end example diff --git a/doc/install.texi b/doc/install.texi index b900fbfbe63152064e25505471850254c1751bc655356ce23c786586f5654975..dede13de9cf6807eda7f1bef036ec7f3e30746d969f03bf62953fcda4d5e6aea 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -10,7 +10,7 @@ @example $ [fetch|wget] http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst $ [fetch|wget] http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst.@{asc,sig@} [verify signature] -$ zstd -d < tofuproxy-@value{VERSION}.tar.zst | tar xf - +$ tar xf tofuproxy-@value{VERSION}.tar.zst $ cd tofuproxy-@value{VERSION} $ ./build @end example diff --git a/doc/integrity.texi b/doc/integrity.texi index 5f2765cb26fc64c17856e102741bb6bb8319434c772fb066ce2e483f975c0ac5..aca891a07ac212d604373e0ffde1540df7b284b502609069edd518d972648bed 100644 --- a/doc/integrity.texi +++ b/doc/integrity.texi @@ -28,7 +28,7 @@ Its fingerprint: @code{SHA256:NIDt9iZUizwivY3GoxmGvbQTH7mz/dmV7ZFOXeYfa2o}. @example $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I tofuproxy@@cypherpunks.ru -n file \ - -s tofuproxy-@value{VERSION}.tar.zst.sig < tofuproxy-@value{VERSION}.tar.zst + -s tofuproxy-@value{VERSION}.tar.zst.sig fifos/del-tls-auth +$ echo example.com >fifos/del-tls-auth @end example To preadd: @example -$ echo example.com path/to/client.cert.pem > fifos/add-tls-auth +$ echo example.com path/to/client.cert.pem >fifos/add-tls-auth @end example diff --git a/doc/usage.texi b/doc/usage.texi index a8e5bdee3972f93480e52f743caffbd3ff098b9f0841526331f9b0b8b551130e..59f4c0b545c6a9f212d635133a579fbdd2e6cba8528c4c6dc1487ff40dadc707 100644 --- a/doc/usage.texi +++ b/doc/usage.texi @@ -34,7 +34,7 @@ @item Trust your newly generated CA: @example -# cat cert.pem >> /etc/ssl/cert.pem +# cat cert.pem >>/etc/ssl/cert.pem @end example @item Point you HTTP/HTTPS clients to @code{http://localhost:8080} proxy. diff --git a/doc/warcs.texi b/doc/warcs.texi index f2d3b31ea78fe4951383c7156c997006371ca3f31dbd9ff8789b559a08ac6bd6..95b2cab45e055870e5b078b15098be2ee1c42035bfaa7ff80760949894e4ba8e 100644 --- a/doc/warcs.texi +++ b/doc/warcs.texi @@ -38,7 +38,7 @@ @item Load WARCs: @example -$ tee fifos/add-warcs < warcs.txt +$ tee fifos/add-warcs fifos/del-warcs +$ echo another.warc >fifos/del-warcs @end example One possibility that @file{smth.warc-00002.warc.gz} has no URIs is that @@ -73,7 +73,7 @@ @end itemize Loading of WARC involves its whole reading and remembering where is each -URI response is located. You can @code{echo SAVE > fifos/add-warcs} to +URI response is located. You can @code{echo SAVE >fifos/add-warcs} to save in-memory index to the disk as @file{....idx.gob} files. During the next load, if those files exists, they are used as index immediately, without expensive WARC parsing. @@ -100,7 +100,7 @@ and much higher decompression speed, than @file{.warc.gz}. @example $ cmd/warc-extract/warc-extract -for-enzstd /path/to.warc.gz | - cmd/zstd/enzstd > /path/to.warc.zst + cmd/zstd/enzstd >/path/to.warc.zst @end example @url{https://www.gnu.org/software/wget/, GNU Wget} can be easily used to diff --git a/fifos/multitail b/fifos/multitail index f6c51f30484b4117afb9afe4b9061c259f3963931e43ee8f03dbcc39ca4eb2c4..cdc4817b2cef4c7d423c2a1c8f7caae0a1d97e851c85ceb2d372744b00b6be43 100755 --- a/fifos/multitail +++ b/fifos/multitail @@ -2,15 +2,15 @@ #!/bin/sh exec multitail \ -wh 10 \ - -t "Trust" -ci magenta -l "while :; do tai64nlocal < log-cert ; done" \ - -t "DANE" -ci yellow --label "DANE " -L "while :; do tai64nlocal < log-dane ; done" \ - -t "Error" -ci red -L "while :; do tai64nlocal < log-err ; done" \ - -t "HTTPAuth" -ci green --label "Auth " -L "while :; do tai64nlocal < log-http-auth ; done" \ - -t "TLSAuth" -ci green --label "Auth " -l "while :; do tai64nlocal < log-tls-auth ; done" \ - -t "Response non-OK" --label "< " -L "while :; do tai64nlocal < log-non-ok ; done" \ - -t "Response OK" -ci green --label "< " -L "while :; do tai64nlocal < log-ok ; done" \ - -t "Redirect " -ci cyan --label "R " -L "while :; do tai64nlocal < log-redir ; done" \ - -t "Request" -ci blue --label "> " -L "while :; do tai64nlocal < log-req ; done" \ - -t "TLS connection" -ci yellow --label "S " -L "while :; do tai64nlocal < log-tls ; done" \ - -t "Various" -ci yellow -L "while :; do tai64nlocal < log-various ; done" \ - -t "WARC" -ci green --label "W " -L "while :; do tai64nlocal < log-warc ; done" + -t "Trust" -ci magenta -l "while :; do tai64nlocal " -L "while :; do tai64nlocal download.texi <download.texi < $texi <$texi < "$tarball".meta4 + http://y.www.tofuproxy.stargrave.org/download/"$tarball" <"$tarball" >"$tarball".meta4 size=$(( $(stat -f %z $tarball) / 1024 )) release_date=$(date "+%Y-%m-%d") diff --git a/state-init b/state-init index 25b45544ecc24786b4e3c58efbba49ae07246a059ba040962fcd180c98ac8f5f..c5282d38ef270172e02db6b8716e1fc82ad7e3686acbd38060228b64cb053a1f 100755 --- a/state-init +++ b/state-init @@ -4,7 +4,7 @@ root="$(dirname "$(realpath -- "$0")")" [ -s cert.pem ] || { prev=`umask` umask 077 - "$root"/cmd/certgen/certgen > cert.pem + "$root"/cmd/certgen/certgen >cert.pem umask $prev } mkdir -p fifos