From da88cea854d81b62c02a835a65bd4d8caa9f5233 Mon Sep 17 00:00:00 2001 From: kev Date: Wed, 17 Jun 2015 12:14:19 +0800 Subject: [PATCH] update --- dante/Dockerfile | 3 +-- dante/docker-compose.yml | 7 +++++++ dante/sockd.conf | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 dante/docker-compose.yml diff --git a/dante/Dockerfile b/dante/Dockerfile index 44d2321..b63f9d3 100644 --- a/dante/Dockerfile +++ b/dante/Dockerfile @@ -31,9 +31,8 @@ ADD sockd.conf /etc/sockd.conf ENV CFGFILE /etc/sockd.conf ENV PIDFILE /tmp/sockd.pid ENV WORKERS 10 -ENV VERBOSE 4 EXPOSE 1080 -CMD sockd -f $CFGFILE -p $PIDFILE -N $WORKERS -d $VERBOSE +CMD sockd -f $CFGFILE -p $PIDFILE -N $WORKERS diff --git a/dante/docker-compose.yml b/dante/docker-compose.yml new file mode 100644 index 0000000..eb4681d --- /dev/null +++ b/dante/docker-compose.yml @@ -0,0 +1,7 @@ +dante: + image: dante + ports: + - "1080:1080" + volumes: + - sockd.conf:/etc/sockd.conf + restart: always diff --git a/dante/sockd.conf b/dante/sockd.conf index 15ba1d5..93099f6 100644 --- a/dante/sockd.conf +++ b/dante/sockd.conf @@ -8,10 +8,10 @@ user.unprivileged: nobody client pass { from: 0.0.0.0/0 port 1-65535 to: 0.0.0.0/0 - log: connect error + log: error # connect disconnect iooperation } -pass { +socks pass { from: 0.0.0.0/0 to: 0.0.0.0/0 protocol: tcp udp log: connect