From 4e72368e7211042dd1deffcd5cad949b34a20d9e Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Sun, 15 Nov 2020 17:33:02 +1100
Subject: [PATCH] Start upgrading caddy to 2

---
 .gitignore |  1 +
 Caddyfile  | 47 +++++++++++++++++++----------------------------
 Dockerfile |  6 +++---
 caddy.sh   |  2 +-
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index f39d75e..a6ebccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 conf/rclone.conf
+.devcontainer
diff --git a/Caddyfile b/Caddyfile
index c2059b6..38cc888 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,36 +1,27 @@
-{$DOMAIN} {
-  proxy / 127.0.0.1:8080 {
-      transparent
-  }
-
-  proxy /jsonrpc 127.0.0.1:6800 {
-    transparent
-    websocket
-  }
-
-  errors stderr
-  gzip
+{
+  auto_https off
 }
 
-{$DOMAIN}/ui {
-  redir / /ui/ 301
+{$DOMAIN}
+
+redir /ui /ui/ 301
+redir /rclone /rclone/ 301
+
+route /rclone/* {
+  uri strip_prefix /rclone
+  reverse_proxy http://localhost:5572
 }
 
-{$DOMAIN}/ui/ {
-  root /usr/local/www/aria2
-  timeouts none
-  gzip
-  errors stderr
+route /ui/* {
+  uri strip_prefix /ui
+  root * /usr/local/www/aria2
+  file_server
 }
 
-{$DOMAIN}/rclone {
-  redir / /rclone/ 301
-}
+reverse_proxy 127.0.0.1:8080
+reverse_proxy /jsonrpc 127.0.0.1:6800
 
-{$DOMAIN}/rclone/ {
-  proxy / 127.0.0.1:5572/ {
-    transparent
-  }
-  gzip
-  errors stderr
+encode gzip
+log {
+  output stderr
 }
diff --git a/Dockerfile b/Dockerfile
index 4dfea57..fa51a4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /app
 
 ENV RPC_SECRET=""
 ENV ENABLE_AUTH=false
-ENV DOMAIN=0.0.0.0:80
+ENV DOMAIN=http://localhost
 ENV ARIA2_USER=user
 ENV ARIA2_PWD=password
 ENV ARIA2_SSL=false
@@ -23,8 +23,8 @@ ADD Caddyfile SecureCaddyfile /usr/local/caddy/
 RUN adduser -D -u 1000 junv \
   && apk update \
   && apk add runit shadow wget bash curl openrc gnupg aria2 tar mailcap --no-cache \
-  && caddy_tag=v1.0.4 \
-  && wget -N https://github.com/caddyserver/caddy/releases/download/${caddy_tag}/caddy_${caddy_tag}_linux_amd64.tar.gz \
+  && caddy_tag=2.2.1 \
+  && wget -N https://github.com/caddyserver/caddy/releases/download/v${caddy_tag}/caddy_${caddy_tag}_linux_amd64.tar.gz \
   && tar -zxvf caddy_${caddy_tag}_linux_amd64.tar.gz \
   && mv caddy /usr/local/bin/ \
   && rm -rf caddy_${caddy_tag}_linux_amd64.tar.gz \
diff --git a/caddy.sh b/caddy.sh
index a7db240..10f05e6 100755
--- a/caddy.sh
+++ b/caddy.sh
@@ -9,4 +9,4 @@ else
   export CADDY_FILE=/usr/local/caddy/Caddyfile
 fi
 
-/usr/local/bin/caddy -quic --conf ${CADDY_FILE}
+/usr/local/bin/caddy run --config ${CADDY_FILE}