Remove shadowsocks

This commit is contained in:
Wojciech Kozlowski 2019-07-28 11:02:11 +02:00
parent 396f95b8f8
commit 6af4c22abd
6 changed files with 5 additions and 80 deletions

View File

@ -84,26 +84,6 @@ nextcloud-pull:
nextcloud: nextcloud-clean nextcloud-build nextcloud-push nextcloud: nextcloud-clean nextcloud-build nextcloud-push
#------------------------------------------------------------------------------
# Shadowsocks
#------------------------------------------------------------------------------
SHADOWSOCKS = $(DOCKER_REGISTRY)/shadowsocks
shadowsocks-clean:
docker rmi $(SHADOWSOCKS) || /bin/true
shadowsocks-build:
docker build -f shadowsocks/Dockerfile -t $(SHADOWSOCKS) ./shadowsocks
shadowsocks-push:
docker push $(SHADOWSOCKS)
shadowsocks-pull:
docker pull $(SHADOWSOCKS)
shadowsocks: shadowsocks-clean shadowsocks-build shadowsocks-push
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Collect targets. # Collect targets.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -115,26 +95,22 @@ clean-all:
clean-builds: \ clean-builds: \
proxy-clean \ proxy-clean \
wiki-clean \ wiki-clean \
nextcloud-clean \ nextcloud-clean
shadowsocks-clean
build-all: \ build-all: \
proxy-build \ proxy-build \
wiki-build \ wiki-build \
nextcloud-build \ nextcloud-build
shadowsocks-build
push-all: \ push-all: \
proxy-push \ proxy-push \
wiki-push \ wiki-push \
nextcloud-push \ nextcloud-push
shadowsocks-push
pull-all: \ pull-all: \
proxy-pull \ proxy-pull \
wiki-pull \ wiki-pull \
nextcloud-pull \ nextcloud-pull
shadowsocks-pull
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Clean - build - push # Clean - build - push

View File

@ -18,7 +18,7 @@ table inet filter {
ip protocol icmp icmp type { echo-request, destination-unreachable, router-advertisement, time-exceeded, parameter-problem } accept ip protocol icmp icmp type { echo-request, destination-unreachable, router-advertisement, time-exceeded, parameter-problem } accept
# activate the following line to accept common local services # activate the following line to accept common local services
tcp dport { 80, 443, {{ ssh_port }}, {{ gitlab_ssh_port }}, {{ shadowsocks_port }} } ct state new accept tcp dport { 80, 443, {{ ssh_port }}, {{ gitlab_ssh_port }} } ct state new accept
# count and drop any other traffic # count and drop any other traffic
counter drop counter drop

View File

@ -20,9 +20,6 @@ default_ssh_port:
# GitLab # GitLab
gitlab_ssh_port: gitlab_ssh_port:
# Shadowsocks
shadowsocks_port:
# Postfix # Postfix
postfix_smtp_server: postfix_smtp_server:
postfix_smtp_port: postfix_smtp_port:

View File

@ -10,7 +10,6 @@ volumes:
letsencrypt: letsencrypt:
runner_0_etc: runner_0_etc:
runner_0_home: runner_0_home:
shadowsocks:
services: services:
@ -140,17 +139,3 @@ services:
- ./proxy/nginx-conf.d:/etc/nginx/conf.d:ro - ./proxy/nginx-conf.d:/etc/nginx/conf.d:ro
- letsencrypt:/etc/letsencrypt - letsencrypt:/etc/letsencrypt
restart: always restart: always
# ---------------------------------------------------------------------------
# Shadowsocks server.
# ---------------------------------------------------------------------------
shadowsocks:
container_name: shadowsocks
build: shadowsocks
image: registry.wojciechkozlowski.eu/wojtek/loki/shadowsocks
ports:
- 7698:7698
volumes:
- shadowsocks:/var/shadowsocks
restart: always

View File

@ -1,15 +0,0 @@
FROM debian:stable-slim
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get -y upgrade
RUN apt-get -y install shadowsocks
ENV SS_VOL /var/shadowsocks
RUN mkdir $SS_VOL
ADD config.json $SS_VOL
EXPOSE 7698
VOLUME ["$SS_VOL"]
CMD ["sh", "-c", "/usr/bin/ssserver -c $SS_VOL/config.json"]

View File

@ -1,18 +0,0 @@
{
"server":"0.0.0.0",
"server_ipv6":"[::]",
"server_port":7698,
"local_address":"127.0.0.1",
"local_port":1080,
"password":"z",
"timeout":120,
"method":"aes-256-cfb",
"protocol":"$auth_sha1_v4_compatible",
"protocol_param":"",
"obfs":"http_simple_compatible",
"obfs_param":"",
"redirect":"",
"dns_ipv6":false,
"fast_open":false,
"workers":1
}