From 70d80650b87a33d2815cbaa0ca53c9b2430bc2dd Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Wed, 1 Mar 2023 20:20:38 +0100
Subject: [PATCH] chore(zipline): refactor config

---
 apps/zipline/config.json             |  8 ++++----
 apps/zipline/docker-compose.yml      |  9 +++++----
 apps/zipline/metadata/description.md | 11 +++--------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/apps/zipline/config.json b/apps/zipline/config.json
index c4f129f9..f061ec6f 100644
--- a/apps/zipline/config.json
+++ b/apps/zipline/config.json
@@ -16,15 +16,15 @@
   "form_fields": [
     {
       "type": "random",
-      "label": "DB_PASSWORD",
+      "label": "ZIPLINE_DB_PASSWORD",
       "min": 32,
-      "env_variable": "DB_PASSWORD"
+      "env_variable": "ZIPLINE_DB_PASSWORD"
     },
     {
       "type": "random",
-      "label": "CORE_SECRET",
+      "label": "ZIPLINE_CORE_SECRET",
       "min": 32,
-      "env_variable": "CORE_SECRET"
+      "env_variable": "ZIPLINE_CORE_SECRET"
     }
   ]
 }
diff --git a/apps/zipline/docker-compose.yml b/apps/zipline/docker-compose.yml
index 7c2c32f2..b3f43ba2 100644
--- a/apps/zipline/docker-compose.yml
+++ b/apps/zipline/docker-compose.yml
@@ -1,17 +1,18 @@
-version: "3.7"
+version: '3.7'
 
 services:
   zipline:
+    container_name: zipline
     image: ghcr.io/diced/zipline:3.6.4
     ports:
       - '${APP_PORT}:3000'
     restart: unless-stopped
     environment:
       - CORE_RETURN_HTTPS=false
-      - CORE_SECRET=${CORE_SECRET}
+      - CORE_SECRET=${ZIPLINE_CORE_SECRET}
       - CORE_HOST=0.0.0.0
       - CORE_PORT=3000
-      - CORE_DATABASE_URL=postgres://tipi:${DB_PASSWORD}@zipline-db/zipline
+      - CORE_DATABASE_URL=postgres://tipi:${ZIPLINE_DB_PASSWORD}@zipline-db/zipline
       - CORE_LOGGER=true
     volumes:
       - '${APP_DATA_DIR}/data/uploads:/zipline/uploads'
@@ -34,7 +35,7 @@ services:
     restart: unless-stopped
     environment:
       - POSTGRES_USER=tipi
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_PASSWORD=${ZIPLINE_DB_PASSWORD}
       - POSTGRES_DB=zipline
     volumes:
       - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
diff --git a/apps/zipline/metadata/description.md b/apps/zipline/metadata/description.md
index a74a27c7..dcf04f84 100644
--- a/apps/zipline/metadata/description.md
+++ b/apps/zipline/metadata/description.md
@@ -1,14 +1,9 @@
 A ShareX/file upload server that is easy to use, packed with features, and with an easy setup!
 
-![Stars](https://img.shields.io/github/stars/diced/zipline?logo=github&style=flat)
-![Version](https://img.shields.io/github/package-json/v/diced/zipline?logo=git&logoColor=white&style=flat)
-![GitHub last commit (branch)](https://img.shields.io/github/last-commit/diced/zipline/trunk?logo=git&logoColor=white&style=flat)
-[![Discord](https://img.shields.io/discord/729771078196527176?color=%23777ed3&label=discord&logo=discord&logoColor=white&style=flat)](https://discord.gg/EAhCRfGxCF)
-
-![Build](https://img.shields.io/github/actions/workflow/status/diced/zipline/build.yml?logo=github&style=flat&branch=trunk)
-[![Docker Image (trunk)](https://img.shields.io/github/actions/workflow/status/diced/zipline/docker.yml?label=Docker%20%28trunk%29&logo=github&style=flat&branch=trunk)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=trunk)
-[![Docker Image (release)](https://img.shields.io/github/actions/workflow/status/diced/zipline/docker-release.yml?label=Docker%20%28release%29&logo=github&style=flat&branch=trunk)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=latest)
+## Default credentials
 
+Username: administrator
+Password: password
 
 ## Features