From d7e26e6e0e1f45461e01438b81cfeb034c84ada7 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Sun, 15 Nov 2020 20:30:54 +1100
Subject: [PATCH] #87 Update secureCaddyfile with caddy 2

---
 SecureCaddyfile | 55 ++++++++++++++++++++-----------------------------
 caddy.sh        |  7 ++++++-
 init.sh         |  4 ++--
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/SecureCaddyfile b/SecureCaddyfile
index 59c09e8..fb886d9 100644
--- a/SecureCaddyfile
+++ b/SecureCaddyfile
@@ -1,42 +1,31 @@
-{$DOMAIN} {
-  proxy / 127.0.0.1:8080 {
-      transparent
-  }
-
-  proxy /jsonrpc 127.0.0.1:6800 {
-    transparent
-    websocket
-  }
-
-  proxy /rclone 127.0.0.1:5572 {
-    transparent
-  }
-
-  gzip
-  errors stderr
+{
+  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
-
-  basicauth / {$ARIA2_USER} {$ARIA2_PWD}
+route /ui/* {
+  uri strip_prefix /ui
+  root * /usr/local/www/aria2
+  file_server
 }
 
-{$DOMAIN}/rclone {
-  redir / /rclone/ 301
+basicauth /ui/* {
+  ARIA2_USER ARIA2_PWD_ENCRYPT
 }
 
-{$DOMAIN}/rclone/ {
-  proxy / 127.0.0.1:5572/ {
-    transparent
-  }
-  gzip
-  errors stderr
+reverse_proxy 127.0.0.1:8080
+reverse_proxy /jsonrpc 127.0.0.1:6800
+
+encode gzip
+log {
+  output stderr
 }
diff --git a/caddy.sh b/caddy.sh
index 10f05e6..4da206b 100755
--- a/caddy.sh
+++ b/caddy.sh
@@ -4,9 +4,14 @@ echo "Run aria2c and ariaNG"
 if [ "$ENABLE_AUTH" = "true" ]; then
   echo "Using Basic Auth config file "
   export CADDY_FILE=/usr/local/caddy/SecureCaddyfile
+
+  echo "**** generate basic auth password for caddy ****"
+  ARIA2_PWD_ENCRYPT=`caddy hash-password -plaintext ${ARIA2_PWD}`
+  sed -i 's/ARIA2_USER/'"${ARIA2_USER}"'/g' /usr/local/caddy/SecureCaddyfile
+  sed -i 's/ARIA2_PWD_ENCRYPT/'"${ARIA2_PWD_ENCRYPT}"'/g' /usr/local/caddy/SecureCaddyfile
 else
   echo "Using caddy without Basic Auth"
   export CADDY_FILE=/usr/local/caddy/Caddyfile
 fi
 
-/usr/local/bin/caddy run --config ${CADDY_FILE}
+/usr/local/bin/caddy run -config ${CADDY_FILE} -adapter=caddyfile
diff --git a/init.sh b/init.sh
index 11263ea..e46ecde 100755
--- a/init.sh
+++ b/init.sh
@@ -4,8 +4,8 @@ echo "**** update uid and gid to ${PUID}:${PGID} ****"
 groupmod -o -g "$PGID" junv
 usermod -o -u "$PUID" junv
 
-mkdir /app/.caddy
-mkdir /app/.cache
+mkdir -p /app/.caddy
+mkdir -p /app/.cache
 
 chown -R junv:junv \
          /app \