From c3f14433dedeca16b1916bd3a9ed93f55875c559 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 11 Jul 2016 13:57:48 +0800
Subject: [PATCH] fix icon

---
 fteproxy/README.md         |  2 --
 openvpn/README.md          | 13 +++++++++++--
 stunnel/README.md          |  7 ++++---
 stunnel/docker-compose.yml | 17 ++++++++++++++++-
 tinc/README.md             |  2 --
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/fteproxy/README.md b/fteproxy/README.md
index ffb61ca..38b2ff6 100644
--- a/fteproxy/README.md
+++ b/fteproxy/README.md
@@ -1,8 +1,6 @@
 fteproxy
 ========
 
-![](https://badge.imagelayers.io/vimagick/fteproxy:latest.svg)
-
 [fteproxy][1] provides transport-layer protection to resist keyword filtering,
 censorship and discriminatory routing policies.
 
diff --git a/openvpn/README.md b/openvpn/README.md
index 71dc94f..afffe1a 100644
--- a/openvpn/README.md
+++ b/openvpn/README.md
@@ -1,9 +1,9 @@
 openvpn
 =======
 
-![](https://badge.imagelayers.io/vimagick/openvpn:latest.svg)
+[OpenVPN][1] is blocked in China. You need to connect vpn via secure tunnel.
 
-OpenVPN is blocked in China. You need to connect vpn via secure tunnel.
+Instead of using [fteproxy][2] as bridge, you can also use [stunnel][3].
 
 - server: vpn.easypi.info
 - bridge: bridge.easypi.info
@@ -93,3 +93,12 @@ route 192.168.1.0 255.255.255.0 net_gateway
 $ systemctl start openvpn@client
 $ systemctl enable openvpn@client
 ```
+
+## References
+
+- <https://community.openvpn.net/openvpn/wiki>
+- <https://www.digitalocean.com/community/tutorials/how-to-set-up-an-openvpn-server-on-ubuntu-16-04>
+
+[1]: https://openvpn.net/index.php/open-source.html
+[2]: https://github.com/vimagick/dockerfiles/tree/master/fteproxy
+[3]: https://github.com/vimagick/dockerfiles/tree/master/stunnel
diff --git a/stunnel/README.md b/stunnel/README.md
index 1a2437d..496d344 100644
--- a/stunnel/README.md
+++ b/stunnel/README.md
@@ -1,6 +1,9 @@
 stunnel
 =======
 
+[Stunnel][1] is a proxy designed to add TLS encryption functionality to
+existing clients and servers without any changes in the programs' code.
+
 ### Overview
 
 domain | ip:port      | country | services
@@ -89,6 +92,4 @@ route 192.168.0.0 255.255.0.0 net_gateway
 ....
 ```
 
-### References
-
-- <https://community.openvpn.net/openvpn/wiki>
+[1]: https://www.stunnel.org/index.html
diff --git a/stunnel/docker-compose.yml b/stunnel/docker-compose.yml
index 6613e66..6a0dfa1 100644
--- a/stunnel/docker-compose.yml
+++ b/stunnel/docker-compose.yml
@@ -1,4 +1,5 @@
-stunnel:
+# In Japan
+master:
   image: vimagick/stunnel
   ports:
     - "4911:4911"
@@ -10,3 +11,17 @@ stunnel:
   external_links:
     - openvpn_server_1:server
   restart: always
+
+# In China
+bridge:
+  image: vimagick/stunnel
+  ports:
+    - "1194:1194"
+  environment:
+    - CLIENT=yes
+    - SERVICE=openvpn
+    - ACCEPT=0.0.0.0:1194
+    - CONNECT=server:4911
+  extra_hosts:
+    - server:1.2.3.4
+  restart: always
diff --git a/tinc/README.md b/tinc/README.md
index 8e6e361..76cd8e0 100644
--- a/tinc/README.md
+++ b/tinc/README.md
@@ -1,8 +1,6 @@
 tinc
 ====
 
-![](https://badge.imagelayers.io/vimagick/tinc:latest.svg)
-
 [tinc][1] is a Virtual Private Network (VPN) daemon that uses tunnelling and
 encryption to create a secure private network between hosts on the Internet.