From 6d615cb3258978b53e18c59e59e2fc56f647daac Mon Sep 17 00:00:00 2001
From: binhex <megalith01@gmail.com>
Date: Thu, 13 Jun 2024 13:44:42 +0100
Subject: [PATCH] remove exposed ports and tidy up readme

---
 Dockerfile |  8 --------
 README.md  | 23 ++++++++++++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c02a241..ee61152 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,14 +27,6 @@ ADD run/nobody/*.sh /home/nobody/
 RUN chmod +x /root/*.sh /home/nobody/*.sh && \
 	/bin/bash /root/install.sh "${RELEASETAG}" "${TARGETARCH}"
 
-# docker settings
-#################
-
-# expose port for http
-EXPOSE 8080
-
-# expose port for https
-EXPOSE 8090
 
 # set permissions
 #################
diff --git a/README.md b/README.md
index 22a2746..3701216 100644
--- a/README.md
+++ b/README.md
@@ -18,17 +18,21 @@ This Docker includes OpenVPN and WireGuard to ensure a secure and private connec
 
 Latest stable SABnzbd release from Arch Linux AUR.<br/>
 Latest stable Privoxy release from Arch Linux repo.<br/>
+Latest stable microsocks release from GitHub.<br/>
 Latest stable OpenVPN release from Arch Linux repo.<br/>
 Latest stable WireGuard release from Arch Linux repo.
 
 ## Usage
 
-```bash
+```text
 docker run -d \
     --cap-add=NET_ADMIN \
     -p 8080:8080 \
     -p 8090:8090 \
     -p 8118:8118 \
+    -p 9118:9118 \
+    -p 58946:58946 \
+    -p 58946:58946/udp \
     --name=<container name> \
     -v <path for data files>:/data \
     -v <path for config files>:/config \
@@ -67,6 +71,12 @@ Please replace all user variables in the above command defined by <> with the co
 
 `http://<host ip>:8118`
 
+## Access microsocks
+
+`<host ip>:9118`
+
+default credentials: admin/socks
+
 ## PIA example
 
 ```bash
@@ -75,6 +85,9 @@ docker run -d \
     -p 8080:8080 \
     -p 8090:8090 \
     -p 8118:8118 \
+    -p 9118:9118 \
+    -p 58946:58946 \
+    -p 58946:58946/udp \
     --name=sabnzbdvpn \
     -v /root/docker/data:/data \
     -v /root/docker/config:/config \
@@ -102,10 +115,6 @@ docker run -d \
     binhex/arch-sabnzbdvpn
 ```
 
-## IMPORTANT
-
-Please note `VPN_INPUT_PORTS` is **NOT** to define the incoming port for the VPN, this environment variable is used to define port(s) you want to allow in to the VPN network when network binding multiple containers together, configuring this incorrectly with the VPN provider assigned incoming port COULD result in IP leakage, you have been warned!.
-
 ## OpenVPN
 
 Please note this Docker image does not include the required OpenVPN configuration file and certificates. These will typically be downloaded from your VPN providers website (look for OpenVPN configuration files), and generally are zipped.
@@ -148,6 +157,10 @@ The list of default NS providers in the above example(s) is as follows:-
 37.235.x.x = FreeDNS<br/>
 1.x.x.x = Cloudflare
 
+---
+**IMPORTANT**<br/>
+Please note `VPN_INPUT_PORTS` is **NOT** to define the incoming port for the VPN, this environment variable is used to define port(s) you want to allow in to the VPN network when network binding multiple containers together, configuring this incorrectly with the VPN provider assigned incoming port COULD result in IP leakage, you have been warned!.
+
 ---
 User ID (PUID) and Group ID (PGID) can be found by issuing the following command for the user you want to run the container as:-