From 6f1fc9d8e5737b8a1364f1173e4060c250841b94 Mon Sep 17 00:00:00 2001
From: Luna Tsuki <lunax@mlunax.com>
Date: Sat, 27 Feb 2021 01:42:26 +0100
Subject: [PATCH] fix up1

---
 up1/Dockerfile           |  1 +
 up1/docker-entrypoint.sh |  6 ++++--
 up1/server.conf.example  | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 up1/server.conf.example

diff --git a/up1/Dockerfile b/up1/Dockerfile
index 08b72f4..c3b2802 100644
--- a/up1/Dockerfile
+++ b/up1/Dockerfile
@@ -26,6 +26,7 @@ ENV server_url ""
 ENV api_key  "abc"
 ENV footer '<a href="https://github.com/Upload/Up1" target="_blank">Source Code</a> - <a href="mailto:someemail@email" id="contact" target="_blank">Contact</a>'
 ENV maximum_file_size "50000000"
+ENV http_port 8080
 
 
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
\ No newline at end of file
diff --git a/up1/docker-entrypoint.sh b/up1/docker-entrypoint.sh
index ddc1846..d0d2d22 100644
--- a/up1/docker-entrypoint.sh
+++ b/up1/docker-entrypoint.sh
@@ -5,10 +5,12 @@ echo "upload.config.server = ''" > client/config.js && \
 echo "upload.config.api_key = '$api_key'" >> client/config.js && \
 echo "upload.config.footer = '$footer'" >> client/config.js
 
+
 # overide server config
+jq '.api_key=$api_key|.maximum_file_size=$maximum_file_size|.http.listen=$http_port' \
+--arg api_key "$api_key" --arg maximum_file_size "$maximum_file_size" --arg http_port ":$http_port" /Up1/server/server.conf > /tmp/tmp.$$.json && mv /tmp/tmp.$$.json /Up1/server/server.conf
 
-jq '.api_key=$api_key|.maximum_file_size=$maximum_file_size' \
---arg api_key "$api_key" --arg maximum_file_size "$maximum_file_size" /Up1/server/server.conf > /tmp/tmp.$$.json && mv /tmp/tmp.$$.json /Up1/server/server.conf
 
+cat /Up1/server/server.conf
 cd /Up1/server
 node server.js
diff --git a/up1/server.conf.example b/up1/server.conf.example
new file mode 100644
index 0000000..49610dc
--- /dev/null
+++ b/up1/server.conf.example
@@ -0,0 +1,29 @@
+{
+  "api_key": "c61540b5ceecd05092799f936e27755f",
+  "delete_key": "",
+  "maximum_file_size": 50000000,
+
+  "path": {
+    "i": "../i",
+    "client": "../client"
+  },
+
+  "http": {
+    "enabled": true,
+    "listen": ":80"
+  },
+
+  "https": {
+    "enabled": false,
+    "listen": ":443",
+    "cert": "./cert.pem",
+    "key": "./key.pem"
+  },
+
+  "cloudflare-cache-invalidate": {
+    "enabled": false,
+    "token": "Cloudflare API token here",
+    "email": "Cloudflare login email here",
+    "domain": "Domain to invalidate cache on"
+  }
+}