From 44ae5632ef7689dadcdb4517ca5434c953c436f0 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 9 Sep 2019 12:26:30 -0400 Subject: [PATCH] Tinyproxy log output is merged in Docker logs (#45) --- README.md | 9 ++------- entrypoint.sh | 5 +---- tinyproxy.conf | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9210085a..0dd3c781 100644 --- a/README.md +++ b/README.md @@ -190,13 +190,8 @@ There are various ways to achieve this, depending on your use case. - port 8888 published `-p 8888:8888/tcp` - your LAN subnet, i.e. 192.168.1.0/24, set as `-e EXTRA_SUBNETS=192.168.1.0/24` 1. With your HTTP proxy client, connect to the Docker host (i.e. `192.168.1.10`) on port `8888`. You might need to enter your credentials if you set them with the environment variables `PROXY_USER` and `PROXY_PASSWORD`. - 1. If you set `PROXY_LOG_LEVEL` to `Info`, you can check the log output of tinyproxy with: - - ```sh - docker exec -it pia cat /var/log/tinyproxy/tinyproxy.log - ``` - - `PROXY_LOG_LEVEL` defaults to `Critical` to avoid logging everything, for privacy purposes as well as to save storage. + 1. If you set `PROXY_LOG_LEVEL` to `Info`, more information will be logged in the Docker logs, merged with the OpenVPN logs. + `PROXY_LOG_LEVEL` defaults to `Critical` to avoid logging everything, for privacy purposes.

-
Access ports of containers connected to PIA

diff --git a/entrypoint.sh b/entrypoint.sh index 7b7349bd..0e1da1d2 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -391,10 +391,7 @@ if [ "$PROXY" == "on" ]; then unset -v PROXY_PASSWORD printf "DONE\n" fi - printf "[INFO] Launching HTTP proxy TinyProxy..." - tinyproxy - exitOnError $? - printf "DONE\n" + tinyproxy -d & fi ############################################ diff --git a/tinyproxy.conf b/tinyproxy.conf index df420be0..937879f1 100644 --- a/tinyproxy.conf +++ b/tinyproxy.conf @@ -9,7 +9,6 @@ MaxSpareServers 20 StartServers 10 MaxRequestsPerChild 0 DisableViaHeader Yes -LogFile "/var/log/tinyproxy/tinyproxy.log" LogLevel Critical # BasicAuth user password