From 6af4c22abd8d9e4c974c62a67588d131248a15af Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 28 Jul 2019 11:02:11 +0200
Subject: [PATCH] Remove shadowsocks

---
 Makefile                     | 32 ++++----------------------------
 ansible/etc/nftables.conf.j2 |  2 +-
 ansible/secrets.def.yml      |  3 ---
 docker-compose.yml           | 15 ---------------
 shadowsocks/Dockerfile       | 15 ---------------
 shadowsocks/config.json      | 18 ------------------
 6 files changed, 5 insertions(+), 80 deletions(-)
 delete mode 100644 shadowsocks/Dockerfile
 delete mode 100644 shadowsocks/config.json

diff --git a/Makefile b/Makefile
index f59e335..a03726c 100644
--- a/Makefile
+++ b/Makefile
@@ -84,26 +84,6 @@ nextcloud-pull:
 
 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.
 # -----------------------------------------------------------------------------
@@ -115,26 +95,22 @@ clean-all:
 clean-builds: \
 	proxy-clean \
 	wiki-clean \
-	nextcloud-clean \
-	shadowsocks-clean
+	nextcloud-clean
 
 build-all: \
 	proxy-build \
 	wiki-build \
-	nextcloud-build \
-	shadowsocks-build
+	nextcloud-build
 
 push-all: \
 	proxy-push \
 	wiki-push \
-	nextcloud-push \
-	shadowsocks-push
+	nextcloud-push
 
 pull-all: \
 	proxy-pull \
 	wiki-pull \
-	nextcloud-pull \
-	shadowsocks-pull
+	nextcloud-pull
 
 # -----------------------------------------------------------------------------
 # Clean - build - push
diff --git a/ansible/etc/nftables.conf.j2 b/ansible/etc/nftables.conf.j2
index 7ff0c88..68b3e93 100644
--- a/ansible/etc/nftables.conf.j2
+++ b/ansible/etc/nftables.conf.j2
@@ -18,7 +18,7 @@ table inet filter {
                 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
-                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
                 counter drop
diff --git a/ansible/secrets.def.yml b/ansible/secrets.def.yml
index 70758b5..490cd1c 100644
--- a/ansible/secrets.def.yml
+++ b/ansible/secrets.def.yml
@@ -20,9 +20,6 @@ default_ssh_port:
 # GitLab
 gitlab_ssh_port:
 
-# Shadowsocks
-shadowsocks_port:
-
 # Postfix
 postfix_smtp_server:
 postfix_smtp_port:
diff --git a/docker-compose.yml b/docker-compose.yml
index d219c6a..0ea1b69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,6 @@ volumes:
   letsencrypt:
   runner_0_etc:
   runner_0_home:
-  shadowsocks:
 
 services:
 
@@ -140,17 +139,3 @@ services:
       - ./proxy/nginx-conf.d:/etc/nginx/conf.d:ro
       - letsencrypt:/etc/letsencrypt
     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
diff --git a/shadowsocks/Dockerfile b/shadowsocks/Dockerfile
deleted file mode 100644
index fb443c4..0000000
--- a/shadowsocks/Dockerfile
+++ /dev/null
@@ -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"]
diff --git a/shadowsocks/config.json b/shadowsocks/config.json
deleted file mode 100644
index 68c0c03..0000000
--- a/shadowsocks/config.json
+++ /dev/null
@@ -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
-}