From 2923b1f8744c47829da2a21d84ec83bcb4c330ad Mon Sep 17 00:00:00 2001
From: Paul Walko <paul@seaturtle.pw>
Date: Sun, 26 Apr 2020 17:52:54 +0200
Subject: [PATCH] remove syncthing on madone

---
 madone/docker/nginx/launch.sh                 |  3 ---
 .../site-confs/madone.seaturtle.pw.enabled    | 20 -------------------
 madone/docker/syncthing/launch.sh             | 19 ------------------
 3 files changed, 42 deletions(-)
 delete mode 100755 madone/docker/syncthing/launch.sh

diff --git a/madone/docker/nginx/launch.sh b/madone/docker/nginx/launch.sh
index 0664e08..4c0cd9e 100755
--- a/madone/docker/nginx/launch.sh
+++ b/madone/docker/nginx/launch.sh
@@ -16,10 +16,7 @@ docker run \
     --volume $PWD/nginx-config:/config:rw \
     --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \
     --volume $PWD/site-confs:/config/nginx/site-confs:ro \
-    --volume $PWD/../syncthing/sync:/sync-docker:ro \
     --volume $HOME/files:/files-docker:ro \
-    --volume $PWD/syncthing-htpasswd:/config/nginx/syncthing-htpasswd:ro \
-    --volume $PWD/sync-htpasswd:/config/nginx/sync-htpasswd:ro \
     --publish 51.159.29.122:80:80 \
     --publish 51.159.29.122:443:443 \
     --publish [2001:bc8:6005:19:208:a2ff:fe0c:917c]:80:80 \
diff --git a/madone/docker/nginx/site-confs/madone.seaturtle.pw.enabled b/madone/docker/nginx/site-confs/madone.seaturtle.pw.enabled
index 47fcfc0..65e2d83 100644
--- a/madone/docker/nginx/site-confs/madone.seaturtle.pw.enabled
+++ b/madone/docker/nginx/site-confs/madone.seaturtle.pw.enabled
@@ -22,16 +22,6 @@ server {
         return 301 https://example.com;
     }
 
-    # Proxy syncthing
-    location /syncthing/ {
-        auth_basic "not today buddy";
-        auth_basic_user_file /config/nginx/syncthing-htpasswd;
-        proxy_set_header X-Real_IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-proto $scheme;
-        proxy_pass http://syncthing:8384/;
-    }
-
     # Proxy weechat
     location /weechat {
         proxy_pass http://172.17.0.1:9001;
@@ -46,14 +36,4 @@ server {
         alias /files-docker;
         autoindex on;
     }
-
-    # Serve syncthing files
-    location /sync {
-        auth_basic "nope definitely not today buddy";
-        auth_basic_user_file /config/nginx/sync-htpasswd;
-        alias /sync-docker;
-        autoindex on;
-    }
-
-    # Proxy everything else???
 }
diff --git a/madone/docker/syncthing/launch.sh b/madone/docker/syncthing/launch.sh
deleted file mode 100755
index 18730f5..0000000
--- a/madone/docker/syncthing/launch.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Assumes pew-net exists
-# Create mounted dirs (as non-root) before launching
-
-docker run \
-    --name syncthing \
-    --detach \
-    --restart unless-stopped \
-    --env PUID=1000 \
-    --env PGID=1000 \
-    --env TZ=Europe/London \
-    --env UMASK_SET=022 \
-    --volume $PWD/syncthing-config:/config:rw \
-    --volume $PWD/syncthing-sync:/sync-docker:rw \
-    --publish 22000:22000 \
-    --publish 21027:21027/udp \
-    --network pew-net \
-    linuxserver/syncthing:v1.3.0-ls20