admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Quentin McGaw
2019-09-09 13:56:50 -04:00
parent aca632ab94
commit 87c84afb4c
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -14,8 +14,7 @@ LABEL \
org.opencontainers.image.source="https://github.com/qdm12/private-internet-access-docker" \ org.opencontainers.image.source="https://github.com/qdm12/private-internet-access-docker" \
org.opencontainers.image.title="PIA client" \ org.opencontainers.image.title="PIA client" \
org.opencontainers.image.description="VPN client to tunnel to private internet access servers using OpenVPN, IPtables, DNS over TLS and Alpine Linux" \ org.opencontainers.image.description="VPN client to tunnel to private internet access servers using OpenVPN, IPtables, DNS over TLS and Alpine Linux" \
image-size="21.1MB" \ image-size="23.3MB" \
image-size="19.9MB" \
ram-usage="13MB to 80MB" \ ram-usage="13MB to 80MB" \
cpu-usage="Low to Medium" cpu-usage="Low to Medium"
ENV USER= \ ENV USER= \

3
README.md
View File

@@ -22,7 +22,7 @@
| Image size | RAM usage | CPU usage | | Image size | RAM usage | CPU usage |
| --- | --- | --- | | --- | --- | --- |
| 19.9MB | 14MB to 80MB | Low to Medium | | 23.3MB | 14MB to 80MB | Low to Medium |
<details><summary>Click to show base components</summary><p> <details><summary>Click to show base components</summary><p>
@@ -60,7 +60,6 @@
- Unbound DNS runs *without root* - Unbound DNS runs *without root*
- OpenVPN can run *without root* but this disallows OpenVPN reconnecting, it can be set with `NONROOT=yes` - OpenVPN can run *without root* but this disallows OpenVPN reconnecting, it can be set with `NONROOT=yes`
## Setup ## Setup
1. <details><summary>Requirements</summary><p> 1. <details><summary>Requirements</summary><p>

12
entrypoint.sh
View File

@@ -147,7 +147,7 @@ fi
printf "Local network parameters:\n" printf "Local network parameters:\n"
printf " * Extra subnets: $EXTRA_SUBNETS\n" printf " * Extra subnets: $EXTRA_SUBNETS\n"
printf " * Tinyproxy HTTP proxy: $TINYPROXY\n" printf " * Tinyproxy HTTP proxy: $TINYPROXY\n"
if [ "$TINYPROXY" = "on" ]; then if [ "$TINYPROXY" == "on" ]; then
printf " * Tinyproxy port: $TINYPROXY_PORT\n" printf " * Tinyproxy port: $TINYPROXY_PORT\n"
tinyproxy_auth=yes tinyproxy_auth=yes
if [ -z $TINYPROXY_USER ]; then if [ -z $TINYPROXY_USER ]; then
@@ -407,12 +407,10 @@ if [ "$TINYPROXY" == "on" ]; then
sed -i "/LogLevel /c\LogLevel $TINYPROXY_LOG" /etc/tinyproxy/tinyproxy.conf sed -i "/LogLevel /c\LogLevel $TINYPROXY_LOG" /etc/tinyproxy/tinyproxy.conf
exitOnError $? exitOnError $?
printf "DONE\n" printf "DONE\n"
if [ ! -z "$TINYPROXY_PORT" ]; then printf "[INFO] Setting TinyProxy port to $TINYPROXY_PORT..."
printf "[INFO] Setting TinyProxy port to $TINYPROXY_PORT..." sed -i "/Port /c\Port $TINYPROXY_PORT" /etc/tinyproxy/tinyproxy.conf
sed -i "/Port /c\Port $TINYPROXY_PORT" /etc/tinyproxy/tinyproxy.conf exitOnError $?
exitOnError $? printf "DONE\n"
printf "DONE\n"
fi
if [ ! -z "$TINYPROXY_USER" ]; then if [ ! -z "$TINYPROXY_USER" ]; then
printf "[INFO] Setting TinyProxy credentials..." printf "[INFO] Setting TinyProxy credentials..."
echo "BasicAuth $TINYPROXY_USER $TINYPROXY_PASSWORD" >> /etc/tinyproxy/tinyproxy.conf echo "BasicAuth $TINYPROXY_USER $TINYPROXY_PASSWORD" >> /etc/tinyproxy/tinyproxy.conf

5
tinyproxy.conf
View File

@@ -10,7 +10,4 @@ StartServers 10
MaxRequestsPerChild 0 MaxRequestsPerChild 0
DisableViaHeader Yes DisableViaHeader Yes
LogLevel Critical LogLevel Critical
# BasicAuth user password # StatFile "/usr/share/tinyproxy/stats.html"
# StatFile "/usr/share/tinyproxy/stats.html"
# ViaProxyName "tinyproxy"