From e30bcdedfd211e3e784ba93e1d03ad5e1ec3b591 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Thu, 30 Apr 2015 18:32:52 +0800
Subject: [PATCH] fix doc

---
 obfsproxy/Dockerfile | 7 +++++--
 obfsproxy/README.md  | 5 +++++
 obfsproxy/fig.yml    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/obfsproxy/Dockerfile b/obfsproxy/Dockerfile
index cf13540..766c9b1 100644
--- a/obfsproxy/Dockerfile
+++ b/obfsproxy/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y build-essential curl python python-dev
 RUN curl https://bootstrap.pypa.io/get-pip.py | python
 RUN pip install obfsproxy
 
+ENV LOG_MIN_SEVERITY info
 ENV DATA_DIR /var/lib/obfsproxy
 ENV PASSWORD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ENV DEST_ADDR openvpn
@@ -18,5 +19,7 @@ ENV LISTEN_PORT 4911
 
 EXPOSE $LISTEN_PORT
 
-CMD obfsproxy --data-dir=$DATA_DIR scramblesuit --password=$PASSWORD --dest=$DEST_ADDR:$DEST_PORT \
-              server $LISTEN_ADDR:LISTEN_PORT
+CMD obfsproxy --log-min-severity=$LOG_MIN_SEVERITY --data-dir=$DATA_DIR \
+              scramblesuit --password=$PASSWORD --dest=$DEST_ADDR:$DEST_PORT \
+              server $LISTEN_ADDR:$LISTEN_PORT
+
diff --git a/obfsproxy/README.md b/obfsproxy/README.md
index af31645..6c473fb 100644
--- a/obfsproxy/README.md
+++ b/obfsproxy/README.md
@@ -1,6 +1,11 @@
 OpenVPN over Obfsproxy
 ======================
 
+Obfsproxy is a pluggable transport proxy written in python.  
+We can transport OpenVPN over Obfsproxy, so that firewall cannot detect it.  
+
+To use the example bellow, you should run `kylemanna/openvpn` with tcp first.
+
 ## docker-compose.yml
 
 ```
diff --git a/obfsproxy/fig.yml b/obfsproxy/fig.yml
index 2b69e2b..741ced1 100644
--- a/obfsproxy/fig.yml
+++ b/obfsproxy/fig.yml
@@ -2,7 +2,7 @@ obfsproxy:
   image: vimagick/obfsproxy:latest
   ports:
     - "4911:4911"
-  links:
+  external_links:
     - openvpn_server_1:openvpn
   environment:
     - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP