From a22b77b3ef8c2a5e2f614333abbb99637108b2eb Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Tue, 20 Nov 2018 09:50:42 +0100
Subject: [PATCH] Fix Caddy + Update

---
 Caddyfile        | 3 ++-
 fdroid-update.sh | 2 +-
 misc/start.sh    | 1 +
 supervisor.ini   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 1bf104b..aa81133 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,4 +1,5 @@
 {$FDROID_REPO_HOST}
 gzip
 log stdout
-browse
\ No newline at end of file
+browse
+tls {$FDROID_REPO_EMAIL}
\ No newline at end of file
diff --git a/fdroid-update.sh b/fdroid-update.sh
index 3e14d3e..f4d40f8 100644
--- a/fdroid-update.sh
+++ b/fdroid-update.sh
@@ -7,6 +7,6 @@ DIR=$2
 FILE=$3
 
 if [ -z "$FILE" ] || [[ "$FILE" == *.apk ]] || [[ "$FILE" == *.yml ]]; then
-    fdroid update -c --rename-apks --clean
+    fdroid update --clean --rename-apks --use-date-from-apk --delete-unknown
 fi
 
diff --git a/misc/start.sh b/misc/start.sh
index e3c340f..41a97d8 100644
--- a/misc/start.sh
+++ b/misc/start.sh
@@ -16,6 +16,7 @@ docker run -it -d \
     -v "${PWD}/data/keystore:/fdroid/keystore" \
     -v "/etc/localtime:/etc/localtime:ro" \
     -e "FDROID_REPO_HOST=${REPO_HOST}" \
+    -e "FDROID_REPO_EMAIL=${REPO_EMAIL}" \
     -e "FDROID_REPO_NAME=${REPO_NAME}" \
     -e "FDROID_REPO_DESCRIPTION=${REPO_DESCRIPTION}" \
     -e "FDROID_KEYSTORE_PASS=${KEYSTORE_PASS}" \
diff --git a/supervisor.ini b/supervisor.ini
index 6d85f3a..34a7a0b 100644
--- a/supervisor.ini
+++ b/supervisor.ini
@@ -24,7 +24,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:caddy]
-command = caddy -conf /fdroid/Caddyfile 
+command = caddy -agree -conf /fdroid/Caddyfile
 directory = /fdroid/repo
 user = root
 autostart = true