From d2c9d30339b587a3349fd5a55ac40b48df25ab0f Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Thu, 14 Dec 2023 02:58:06 -0500
Subject: [PATCH] you're welcome sugon

---
 TidalStream (Zipline)/.env               | 45 ++++++++++++++++++++++
 TidalStream (Zipline)/docker-compose.yml | 48 +-----------------------
 2 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 TidalStream (Zipline)/.env

diff --git a/TidalStream (Zipline)/.env b/TidalStream (Zipline)/.env
new file mode 100644
index 0000000..f2f7155
--- /dev/null
+++ b/TidalStream (Zipline)/.env	
@@ -0,0 +1,45 @@
+# Set this to 'false' if you are not using a reverse proxy with HTTPS
+- CORE_RETURN_HTTPS=true
+- CORE_SECRET=changeme
+- CORE_HOST=0.0.0.0
+- CORE_DATABASE_URL=postgres://postgres:postgres@postgres/postgres
+- CORE_PORT=3001
+- CORE_LOGGER=true
+
+# If you don't want to use s3, change the variables below:
+# See: https://zipline.diced.sh/docs/config/datasource
+- DATASOURCE_TYPE=s3
+- DATASOURCE_S3_SECRET_ACCESS_KEY=changeme
+- DATASOURCE_S3_ACCESS_KEY_ID=changeme
+- DATASOURCE_S3_ENDPOINT=changeme
+- DATASOURCE_S3_BUCKET=zipline
+- DATASOURCE_S3_FORCE_S3_PATH=true
+- DATASOURCE_S3_REGION=changeme
+- DATASOURCE_S3_USE_SSL=true
+
+# Website configuration
+- WEBSITE_TITLE=TidalStream
+- MFA_TOTP_ENABLED="true  # Enables 2 Factor Authentication"
+- EXIF_ENABLED="true  # Enables Exiftool metadata, see https://zipline.diced.sh/docs/config/exif"
+# Uncomment this line if you want GPS metadata to be automatically removed:
+# - EXIF_REMOVE_GPS=true
+- OAUTH_DISCORD_CLIENT_ID=changeme
+- OAUTH_DISCORD_CLIENT_SECRET=changeme
+- FEATURES_OAUTH_REGISTRATION="true  # Allows users to register using an OAuth provider, see https://zipline.diced.sh/docs/config/oauth"
+- FEATURES_OAUTH_LOGIN_ONLY="true  # Allows users to log into their accounts using an OAuth provider, but disallows registration"
+
+# Discord webhook configuration
+- DISCORD_URL=changeme
+- DISCORD_UPLOAD_USERNAME="TidalStream Uploads"
+- DISCORD_SHORTEN_USERNAME="TidalStream URLs"
+- DISCORD_UPLOAD_EMBED_IMAGE=true
+- DISCORD_SHORTEN_EMBED_IMAGE=false
+- DISCORD_UPLOAD_EMBED_TITLE="New file uploaded!"
+- DISCORD_SHORTEN_EMBED_TITLE="New URL shortened!"
+- DISCORD_UPLOAD_EMBED_DESCRIPTION="**User:** `{user.username}`\n**Size:** `{file.size::bytes}`"
+- DISCORD_SHORTEN_EMBED_DESCRIPTION="**User:** `{user.username}`\n**Vanity:** `{url.vanity}`\n**Destination:** `{url.destination}`"
+- DISCORD_UPLOAD_EMBED_FOOTER="File ID - {file.id}"
+- DISCORD_SHORTEN_EMBED_FOOTER="URL ID - {url.id}"
+- DISCORD_UPLOAD_EMBED_COLOR=0x0c101c
+- DISCORD_SHORTEN_EMBED_COLOR=0x0c101c
+- DISCORD_AVATAR_URL=https://cdn.seaswimmer.cc/tidalstream.png
diff --git a/TidalStream (Zipline)/docker-compose.yml b/TidalStream (Zipline)/docker-compose.yml
index ab5f0ab..0390412 100644
--- a/TidalStream (Zipline)/docker-compose.yml	
+++ b/TidalStream (Zipline)/docker-compose.yml	
@@ -20,52 +20,8 @@ services:
     ports:
       - '3001:3001'
     restart: unless-stopped
-    environment:
-      # Set this to 'false' if you are not using a reverse proxy with HTTPS
-      - CORE_RETURN_HTTPS=true
-      - CORE_SECRET=changeme
-      - CORE_HOST=0.0.0.0
-      - CORE_DATABASE_URL=postgres://postgres:postgres@postgres/postgres
-      - CORE_PORT=3001
-      - CORE_LOGGER=true
-
-      # If you don't want to use s3, change the variables below:
-      # See: https://zipline.diced.sh/docs/config/datasource
-      - DATASOURCE_TYPE=s3
-      - DATASOURCE_S3_SECRET_ACCESS_KEY=changeme
-      - DATASOURCE_S3_ACCESS_KEY_ID=changeme
-      - DATASOURCE_S3_ENDPOINT=changeme
-      - DATASOURCE_S3_BUCKET=zipline
-      - DATASOURCE_S3_FORCE_S3_PATH=true
-      - DATASOURCE_S3_REGION=changeme
-      - DATASOURCE_S3_USE_SSL=true
-
-      # Website configuration
-      - WEBSITE_TITLE=TidalStream
-      - MFA_TOTP_ENABLED=true  # Enables 2 Factor Authentication
-      - EXIF_ENABLED=true  # Enables Exiftool metadata, see https://zipline.diced.sh/docs/config/exif
-      # Uncomment this line if you want GPS metadata to be automatically removed:
-      # - EXIF_REMOVE_GPS=true
-      - OAUTH_DISCORD_CLIENT_ID=changeme
-      - OAUTH_DISCORD_CLIENT_SECRET=changeme
-      - FEATURES_OAUTH_REGISTRATION=true  # Allows users to register using an OAuth provider, see https://zipline.diced.sh/docs/config/oauth
-      - FEATURES_OAUTH_LOGIN_ONLY=true  # Allows users to log into their accounts using an OAuth provider, but disallows registration
-
-      # Discord webhook configuration
-      - DISCORD_URL=changeme
-      - DISCORD_UPLOAD_USERNAME=TidalStream Uploads
-      - DISCORD_SHORTEN_USERNAME=TidalStream URLs
-      - DISCORD_UPLOAD_EMBED_IMAGE=true
-      - DISCORD_SHORTEN_EMBED_IMAGE=false
-      - DISCORD_UPLOAD_EMBED_TITLE=New file uploaded!
-      - DISCORD_SHORTEN_EMBED_TITLE=New URL shortened!
-      - DISCORD_UPLOAD_EMBED_DESCRIPTION=**User:** `{user.username}`\n**Size:** `{file.size::bytes}`
-      - DISCORD_SHORTEN_EMBED_DESCRIPTION=**User:** `{user.username}`\n**Vanity:** `{url.vanity}`\n**Destination:** `{url.destination}`
-      - DISCORD_UPLOAD_EMBED_FOOTER=File ID - {file.id}
-      - DISCORD_SHORTEN_EMBED_FOOTER=URL ID - {url.id}
-      - DISCORD_UPLOAD_EMBED_COLOR=0x0c101c
-      - DISCORD_SHORTEN_EMBED_COLOR=0x0c101c
-      - DISCORD_AVATAR_URL=https://cdn.seaswimmer.cc/tidalstream.png
+    env_file:
+      - .env
     volumes:
       - './uploads:/zipline/uploads'
       - './public:/zipline/public'