From d783bc89013638e26f62ce73b93f322dd07e66b0 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Wed, 30 Nov 2022 12:38:55 -0600
Subject: [PATCH] logging: make logging an env var

---
 Dockerfile             | 8 ++++----
 env                    | 3 ++-
 files/helpers/const.py | 2 +-
 startup_chat.sh        | 2 +-
 ubuntu_setup.sh        | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 37af344d9..2d62a4b3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,10 +33,10 @@ RUN chown rdrama:rdrama /var/log/rdrama
 ENV NODE_VERSION=16.13.0
 RUN apt install -y curl
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
-ENV NVM_DIR=/root/.nvm
-RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
-RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
-RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
+ENV NVM_DIRECTORY=/root/.nvm
+RUN . "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION}
+RUN . "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION}
+RUN . "$NVM_DIRECTORY/nvm.sh" && nvm alias default v${NODE_VERSION}
 ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 RUN node --version
 RUN npm --version
diff --git a/env b/env
index 177827cd6..16fb1e32e 100644
--- a/env
+++ b/env
@@ -5,6 +5,7 @@ export SECRET_KEY="blahblahblah"
 export DATABASE_URL="postgresql://postgres@localhost:5432"
 export REDIS_URL="redis://localhost:6379"
 export PROXY_URL="http://localhost:18080"
+export LOG_DIRECTORY="/var/log/rdrama"
 export GIPHY_KEY="blahblahblah"
 export DISCORD_BOT_TOKEN="blahblahblah"
 export TURNSTILE_SITEKEY="blahblahblah"
@@ -34,5 +35,5 @@ export CF_KEY="blahblahblah"
 export CF_ZONE="blahblahblah"
 export DEBIAN_FRONTEND="noninteractive"
 export NODE_VERSION="16.13.0"
-export NVM_DIR="/root/.nvm"
+export NVM_DIRECTORYECTORY="/root/.nvm"
 export TELEGRAM_LINK="blahblahblah"
diff --git a/files/helpers/const.py b/files/helpers/const.py
index 13a08a8d4..f392a0e8c 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -9,6 +9,7 @@ SITE = environ.get("SITE", "localhost").strip()
 SITE_NAME = environ.get("SITE_NAME", "rdrama.net").strip()
 SECRET_KEY = environ.get("SECRET_KEY", DEFAULT_CONFIG_VALUE).strip()
 PROXY_URL = environ.get("PROXY_URL", "http://localhost:18080").strip()
+LOG_DIRECTORY = environ.get("LOG_DIRECTORY", "/var/log/rdrama")
 GIPHY_KEY = environ.get("GIPHY_KEY", DEFAULT_CONFIG_VALUE).strip()
 DISCORD_BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN", DEFAULT_CONFIG_VALUE).strip()
 TURNSTILE_SITEKEY = environ.get("TURNSTILE_SITEKEY", DEFAULT_CONFIG_VALUE).strip()
@@ -50,7 +51,6 @@ class Service(Enum):
 CLOUDFLARE_COOKIE_VALUE = "yes." # remember to change this in CloudFlare too
 
 SETTINGS_FILENAME = '/site_settings.json'
-LOG_DIRECTORY = '/var/log/rdrama'
 
 DEFAULT_RATELIMIT = "3/second;30/minute;200/hour;1000/day"
 DEFAULT_RATELIMIT_SLOWER = "1/second;30/minute;200/hour;1000/day"
diff --git a/startup_chat.sh b/startup_chat.sh
index 67a3f630f..060ee15fc 100644
--- a/startup_chat.sh
+++ b/startup_chat.sh
@@ -3,7 +3,7 @@
 cd /rDrama
 
 . /env
-PATH="${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+PATH="${NVM_DIRECTORY}/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 
 cd ./chat
 yarn install
diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh
index b23b4d5fb..1bca9f90d 100644
--- a/ubuntu_setup.sh
+++ b/ubuntu_setup.sh
@@ -35,9 +35,9 @@ pip3 install -r requirements.txt
 
 apt -y install curl
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
-. "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
-. "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
-. "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
+. "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION}
+. "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION}
+. "$NVM_DIRECTORY/nvm.sh" && nvm alias default v${NODE_VERSION}
 PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 node --version
 npm --version