From 1e281512e672fe832317a57cb05df0c965db6d13 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 24 Oct 2023 14:35:44 +0000 Subject: Fix examples Signed-off-by: Laurent Bercot --- examples/openrc/httpd-4.initd | 4 ++-- examples/openrc/httpd-6.initd | 4 ++-- examples/openrc/httpsd-4.initd | 4 ++-- examples/openrc/httpsd-6.initd | 4 ++-- examples/s6-rc/httpd-4/run | 5 ++--- examples/s6-rc/httpd-6/run | 5 ++--- examples/s6-rc/httpsd-4/run | 4 ++-- examples/s6-rc/httpsd-6/run | 4 ++-- examples/s6/httpd-4/run | 5 ++--- examples/s6/httpd-6/run | 5 ++--- examples/s6/httpsd-4/run | 4 ++-- examples/s6/httpsd-6/run | 4 ++-- examples/tipidee.conf | 11 ++++++----- 13 files changed, 30 insertions(+), 33 deletions(-) diff --git a/examples/openrc/httpd-4.initd b/examples/openrc/httpd-4.initd index c3024f3..77d4efb 100644 --- a/examples/openrc/httpd-4.initd +++ b/examples/openrc/httpd-4.initd @@ -6,8 +6,8 @@ _ip=0.0.0.0 _uid=`id -u www-data` _gid=`id -g www-data` -command=/bin/env -command_args="UID=${_uid} GID=${_gid} s6-tcpserver4 -U ${_ip} 80 s6-tcpserver-access tipideed" +command=/usr/bin/env +command_args="UID=${_uid} GID=${_gid} s6-tcpserver -U ${_ip} 80 tipideed" command_background=yes directory=/home/www-data pidfile=/run/httpd-4.pid diff --git a/examples/openrc/httpd-6.initd b/examples/openrc/httpd-6.initd index 5b8a4cb..f53f38f 100644 --- a/examples/openrc/httpd-6.initd +++ b/examples/openrc/httpd-6.initd @@ -6,8 +6,8 @@ _ip=:: _uid=`id -u www-data` _gid=`id -g www-data` -command=/bin/env -command_args="UID=${_uid} GID=${_gid} s6-tcpserver6 -U ${_ip} 80 s6-tcpserver-access tipideed" +command=/usr/bin/env +command_args="UID=${_uid} GID=${_gid} s6-tcpserver -U ${_ip} 80 tipideed" command_background=yes directory=/home/www-data pidfile=/run/httpd-6.pid diff --git a/examples/openrc/httpsd-4.initd b/examples/openrc/httpsd-4.initd index 0586286..a943c27 100644 --- a/examples/openrc/httpsd-4.initd +++ b/examples/openrc/httpsd-4.initd @@ -6,8 +6,8 @@ _ip=0.0.0.0 _uid=`id -u www-data` _gid=`id -g www-data` -command=/bin/env -command_args="UID=${_uid} GID=${_gid} KEYFILE=/etc/acme/private/examplecom-key.pem CERTFILE=/etc/acme/examplecom-cert.pem s6-tlsserver -e -U ${_ip} 443 tipideed" +command=/usr/bin/env +command_args="UID=${_uid} GID=${_gid} KEYFILE=/etc/acme/private/examplecom-key.pem CERTFILE=/etc/acme/examplecom-cert.pem s6-tlsserver -U ${_ip} 443 tipideed" command_background=yes directory=/home/www-data pidfile=/run/httpsd-4.pid diff --git a/examples/openrc/httpsd-6.initd b/examples/openrc/httpsd-6.initd index 3c80105..a76b8a3 100644 --- a/examples/openrc/httpsd-6.initd +++ b/examples/openrc/httpsd-6.initd @@ -6,8 +6,8 @@ _ip=:: _uid=`id -u www-data` _gid=`id -g www-data` -command=/bin/env -command_args="UID=${_uid} GID=${_gid} KEYFILE=/etc/acme/private/examplecom-key.pem CERTFILE=/etc/acme/examplecom-cert.pem s6-tlsserver -e -U ${_ip} 443 tipideed" +command=/usr/bin/env +command_args="UID=${_uid} GID=${_gid} KEYFILE=/etc/acme/private/examplecom-key.pem CERTFILE=/etc/acme/examplecom-cert.pem s6-tlsserver -U ${_ip} 443 tipideed" command_background=yes directory=/home/www-data pidfile=/run/httpsd-6.pid diff --git a/examples/s6-rc/httpd-4/run b/examples/s6-rc/httpd-4/run index 190392f..740cd5f 100755 --- a/examples/s6-rc/httpd-4/run +++ b/examples/s6-rc/httpd-4/run @@ -5,6 +5,5 @@ backtick -E ip { pipeline { s6-dnsip4 example.com } head -n 1 } s6-envuidgid www cd /home/www fdmove 1 3 -s6-tcpserver4 -v2 -1 -U -c 512 -- $ip 80 -s6-tcpserver-access -lexample.com -- -tipideed -v2 -- +s6-tcpserver -v2 -1 -U -c 512 -- $ip 80 +tipideed diff --git a/examples/s6-rc/httpd-6/run b/examples/s6-rc/httpd-6/run index ae4dbba..6be027b 100755 --- a/examples/s6-rc/httpd-6/run +++ b/examples/s6-rc/httpd-6/run @@ -5,6 +5,5 @@ backtick -E ip { pipeline { s6-dnsip6 example.com } head -n 1 } s6-envuidgid www cd /home/www fdmove 1 3 -s6-tcpserver6 -v2 -1 -U -c 512 -- $ip 80 -s6-tcpserver-access -lexample.com -- -tipideed -v2 -- +s6-tcpserver -v2 -1 -U -c 512 -- $ip 80 +tipideed diff --git a/examples/s6-rc/httpsd-4/run b/examples/s6-rc/httpsd-4/run index 54be026..2f1842f 100755 --- a/examples/s6-rc/httpsd-4/run +++ b/examples/s6-rc/httpsd-4/run @@ -7,5 +7,5 @@ export KEYFILE /etc/ssl/acme/private/example.com/key.pem export CERTFILE /etc/ssl/acme/example.com/cert.pem cd /home/www fdmove 1 3 -s6-tlsserver -v -4 -1 -U -c 512 -K 30000 -- $ip 443 -tipideed -v2 -- +s6-tlsserver -v -1 -U -c 512 -K 30000 -- $ip 443 +tipideed diff --git a/examples/s6-rc/httpsd-6/run b/examples/s6-rc/httpsd-6/run index 652a354..3523609 100755 --- a/examples/s6-rc/httpsd-6/run +++ b/examples/s6-rc/httpsd-6/run @@ -7,5 +7,5 @@ export KEYFILE /etc/ssl/acme/private/example.com/key.pem export CERTFILE /etc/ssl/acme/example.com/cert.pem cd /home/www fdmove 1 3 -s6-tlsserver -v -6 -1 -U -c 512 -K 30000 -- $ip 443 -tipideed -v2 -- +s6-tlsserver -v -1 -U -c 512 -K 30000 -- $ip 443 +tipideed diff --git a/examples/s6/httpd-4/run b/examples/s6/httpd-4/run index 190392f..740cd5f 100755 --- a/examples/s6/httpd-4/run +++ b/examples/s6/httpd-4/run @@ -5,6 +5,5 @@ backtick -E ip { pipeline { s6-dnsip4 example.com } head -n 1 } s6-envuidgid www cd /home/www fdmove 1 3 -s6-tcpserver4 -v2 -1 -U -c 512 -- $ip 80 -s6-tcpserver-access -lexample.com -- -tipideed -v2 -- +s6-tcpserver -v2 -1 -U -c 512 -- $ip 80 +tipideed diff --git a/examples/s6/httpd-6/run b/examples/s6/httpd-6/run index ae4dbba..6be027b 100755 --- a/examples/s6/httpd-6/run +++ b/examples/s6/httpd-6/run @@ -5,6 +5,5 @@ backtick -E ip { pipeline { s6-dnsip6 example.com } head -n 1 } s6-envuidgid www cd /home/www fdmove 1 3 -s6-tcpserver6 -v2 -1 -U -c 512 -- $ip 80 -s6-tcpserver-access -lexample.com -- -tipideed -v2 -- +s6-tcpserver -v2 -1 -U -c 512 -- $ip 80 +tipideed diff --git a/examples/s6/httpsd-4/run b/examples/s6/httpsd-4/run index 54be026..2f1842f 100755 --- a/examples/s6/httpsd-4/run +++ b/examples/s6/httpsd-4/run @@ -7,5 +7,5 @@ export KEYFILE /etc/ssl/acme/private/example.com/key.pem export CERTFILE /etc/ssl/acme/example.com/cert.pem cd /home/www fdmove 1 3 -s6-tlsserver -v -4 -1 -U -c 512 -K 30000 -- $ip 443 -tipideed -v2 -- +s6-tlsserver -v -1 -U -c 512 -K 30000 -- $ip 443 +tipideed diff --git a/examples/s6/httpsd-6/run b/examples/s6/httpsd-6/run index 652a354..3523609 100755 --- a/examples/s6/httpsd-6/run +++ b/examples/s6/httpsd-6/run @@ -7,5 +7,5 @@ export KEYFILE /etc/ssl/acme/private/example.com/key.pem export CERTFILE /etc/ssl/acme/example.com/cert.pem cd /home/www fdmove 1 3 -s6-tlsserver -v -6 -1 -U -c 512 -K 30000 -- $ip 443 -tipideed -v2 -- +s6-tlsserver -v -1 -U -c 512 -K 30000 -- $ip 443 +tipideed diff --git a/examples/tipidee.conf b/examples/tipidee.conf index a451906..2138400 100644 --- a/examples/tipidee.conf +++ b/examples/tipidee.conf @@ -1,9 +1,5 @@ ### Global definitions. -# tipideed verbosity (overridden by the -v option). -# 0 is quiet, 1 is normal, 2+ is verbose. -# global verbosity 1 - # tipideed will exit if the client does not send a new request # after N milliseconds. # 0 means no timeout. @@ -29,7 +25,7 @@ # When the requested URL is a directory, tipideed will serve the first # existing file in this list. (Useful e.g. if you have an index.cgi program.) -# global index_file index.html +# index-file index.html # tipidee, by default, will log basic information on the requests, # and the status and Content-Length of its answers. @@ -39,6 +35,11 @@ # The default mappings should work well for most servers. # content-type text/html .html .htm +# You can add custom headers if you like. "weak" means that a CGI script +# can override them; "strong" means that they will take precedence over +# whatever a CGI script writes. +# custom-header weak X-Content-Type-Options nosniff + ### Definitions for the example.com domain # domain example.com -- cgit v1.2.3