From 2f40100ed255f2a744e5baf11fc302133fce490b Mon Sep 17 00:00:00 2001
From: Junv Zhao <wahyd4@gmail.com>
Date: Mon, 25 Sep 2017 13:07:53 +0800
Subject: [PATCH] Update docker file by enable caddy filemanager plugin.

---
 caddy/Caddyfile      |  8 ++++++++
 caddy/Dockerfile     |  7 +++++--
 caddy/conf/aria2c.sh | 10 +++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index ece7281..147160d 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -4,4 +4,12 @@
   gzip
   log stdout
   errors stdout
+
+
 }
+
+{$DOMAIN}/files {
+  filemanager / /data
+}
+
+
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 1ea97ce..e88048c 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,5 +1,6 @@
-FROM abiosoft/caddy
-MAINTAINER Junv<wahyd4@gmail.com>
+FROM alpine:edge
+
+LABEL AUTHOR=Junv<wahyd4@gmail.com>
 
 WORKDIR /root
 
@@ -14,6 +15,8 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositorie
 
 RUN apk update && apk add wget bash curl openrc screen aria2 tar --no-cache
 
+RUN curl https://getcaddy.com | bash -s personal http.filemanager
+
 ADD conf /root/conf
 
 COPY Caddyfile /usr/local/caddy/Caddyfile
diff --git a/caddy/conf/aria2c.sh b/caddy/conf/aria2c.sh
index 6ee7304..b460c65 100644
--- a/caddy/conf/aria2c.sh
+++ b/caddy/conf/aria2c.sh
@@ -11,14 +11,18 @@ fi
 if [ "$SSL" = "true" ]; then
 echo "Start aria2 with secure config"
 
-/usr/bin/aria2c --conf-path="/root/conf/aria2.conf" -D --enable-rpc --rpc-listen-all --rpc-certificate=/root/conf/key/aria2.crt --rpc-private-key=/root/conf/key/aria2.key --rpc-secret="$RPC_SECRET" --rpc-secure \
+/usr/bin/aria2c --conf-path="/root/conf/aria2.conf" -D  \
+--enable-rpc --rpc-listen-all  \
+--rpc-certificate=/root/conf/key/aria2.crt \
+--rpc-private-key=/root/conf/key/aria2.key \
+--rpc-secret="$RPC_SECRET" --rpc-secure \
 && caddy -quic --conf ${CADDY_FILE}
 
 else
 echo "Start aria2 with standard mode"
-/usr/bin/aria2c --conf-path="/root/conf/aria2.conf" -D --enable-rpc --rpc-listen-all \
+/usr/bin/aria2c --conf-path="/root/conf/aria2.conf" -D \
+--enable-rpc --rpc-listen-all \
 && caddy -quic --conf ${CADDY_FILE}
-
 fi