1
2
mirror of https://github.com/vimagick/dockerfiles synced 2024-06-28 09:41:20 +00:00

add meek to tor

This commit is contained in:
kev 2015-10-27 10:51:45 +08:00
parent 6c163618c0
commit 62d3b603b5
3 changed files with 9 additions and 2 deletions

@ -20,6 +20,9 @@ RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositor
&& GOPATH=/tmp/obfs4 go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy \ && GOPATH=/tmp/obfs4 go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy \
&& mv /tmp/obfs4/bin/obfs4proxy /usr/bin \ && mv /tmp/obfs4/bin/obfs4proxy /usr/bin \
&& rm -rf /tmp/obfs4 \ && rm -rf /tmp/obfs4 \
&& GOPATH=/tmp/meek go get git.torproject.org/pluggable-transports/meek.git/meek-server \
&& mv /tmp/meek/bin/meek-server /usr/bin \
&& rm -rf /tmp/meek \
&& apk del build-base \ && apk del build-base \
git \ git \
gmp-dev \ gmp-dev \
@ -32,6 +35,6 @@ COPY ./torrc /etc/tor/torrc
USER tor USER tor
WORKDIR /var/lib/tor WORKDIR /var/lib/tor
VOLUME /etc/tor /var/lib/tor VOLUME /etc/tor /var/lib/tor
EXPOSE 9001 9030 9050 9051 EXPOSE 7002 9001 9030 9050 9051
CMD ["/usr/bin/tor", "-f", "/etc/tor/torrc"] CMD ["/usr/bin/tor", "-f", "/etc/tor/torrc"]

@ -15,6 +15,7 @@ state security.
ServerTransportPlugin: ServerTransportPlugin:
- [x] fte - [x] fte
- [x] meek
- [x] obfs3 - [x] obfs3
- [x] obfs4 - [x] obfs4
@ -43,6 +44,7 @@ Nickname datageek
ContactInfo noreply@datageek.info ContactInfo noreply@datageek.info
DataDirectory /var/lib/tor DataDirectory /var/lib/tor
#ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed #ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
#ServerTransportPlugin meek exec /usr/bin/meek-server --log /var/log/meek-server.log --port 7002 --cert cert.pem --key key.pem
#ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed #ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
``` ```
@ -52,7 +54,8 @@ ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
``` ```
#Socks5Proxy 127.0.0.1:1080 #Socks5Proxy 127.0.0.1:1080
UseBridges 1 UseBridges 1
#Bridge fte 104.238.161.174:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083 #Bridge fte 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083
#Bridge meek 1.2.3.4:9001 url=https://meek.datageek.info:7002/
#Bridge obfs3 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083 #Bridge obfs3 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083
Bridge obfs4 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083 Bridge obfs4 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083
``` ```

@ -6,5 +6,6 @@ Nickname datageek
ContactInfo noreply@datageek.info ContactInfo noreply@datageek.info
DataDirectory /var/lib/tor DataDirectory /var/lib/tor
#ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed #ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
#ServerTransportPlugin meek exec /usr/bin/meek-server --log /var/log/meek-server.log --port 7002 --cert cert.pem --key key.pem
#ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed #ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy