forked from rDrama/rDrama
logging: make logging an env var
parent
69a44baea7
commit
d783bc8901
|
@ -33,10 +33,10 @@ RUN chown rdrama:rdrama /var/log/rdrama
|
||||||
ENV NODE_VERSION=16.13.0
|
ENV NODE_VERSION=16.13.0
|
||||||
RUN apt install -y curl
|
RUN apt install -y curl
|
||||||
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
|
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
|
||||||
ENV NVM_DIR=/root/.nvm
|
ENV NVM_DIRECTORY=/root/.nvm
|
||||||
RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
|
RUN . "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION}
|
||||||
RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
|
RUN . "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION}
|
||||||
RUN . "$NVM_DIR/nvm.sh" && nvm alias default 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}"
|
ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
|
||||||
RUN node --version
|
RUN node --version
|
||||||
RUN npm --version
|
RUN npm --version
|
||||||
|
|
3
env
3
env
|
@ -5,6 +5,7 @@ export SECRET_KEY="blahblahblah"
|
||||||
export DATABASE_URL="postgresql://postgres@localhost:5432"
|
export DATABASE_URL="postgresql://postgres@localhost:5432"
|
||||||
export REDIS_URL="redis://localhost:6379"
|
export REDIS_URL="redis://localhost:6379"
|
||||||
export PROXY_URL="http://localhost:18080"
|
export PROXY_URL="http://localhost:18080"
|
||||||
|
export LOG_DIRECTORY="/var/log/rdrama"
|
||||||
export GIPHY_KEY="blahblahblah"
|
export GIPHY_KEY="blahblahblah"
|
||||||
export DISCORD_BOT_TOKEN="blahblahblah"
|
export DISCORD_BOT_TOKEN="blahblahblah"
|
||||||
export TURNSTILE_SITEKEY="blahblahblah"
|
export TURNSTILE_SITEKEY="blahblahblah"
|
||||||
|
@ -34,5 +35,5 @@ export CF_KEY="blahblahblah"
|
||||||
export CF_ZONE="blahblahblah"
|
export CF_ZONE="blahblahblah"
|
||||||
export DEBIAN_FRONTEND="noninteractive"
|
export DEBIAN_FRONTEND="noninteractive"
|
||||||
export NODE_VERSION="16.13.0"
|
export NODE_VERSION="16.13.0"
|
||||||
export NVM_DIR="/root/.nvm"
|
export NVM_DIRECTORYECTORY="/root/.nvm"
|
||||||
export TELEGRAM_LINK="blahblahblah"
|
export TELEGRAM_LINK="blahblahblah"
|
||||||
|
|
|
@ -9,6 +9,7 @@ SITE = environ.get("SITE", "localhost").strip()
|
||||||
SITE_NAME = environ.get("SITE_NAME", "rdrama.net").strip()
|
SITE_NAME = environ.get("SITE_NAME", "rdrama.net").strip()
|
||||||
SECRET_KEY = environ.get("SECRET_KEY", DEFAULT_CONFIG_VALUE).strip()
|
SECRET_KEY = environ.get("SECRET_KEY", DEFAULT_CONFIG_VALUE).strip()
|
||||||
PROXY_URL = environ.get("PROXY_URL", "http://localhost:18080").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()
|
GIPHY_KEY = environ.get("GIPHY_KEY", DEFAULT_CONFIG_VALUE).strip()
|
||||||
DISCORD_BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN", 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()
|
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
|
CLOUDFLARE_COOKIE_VALUE = "yes." # remember to change this in CloudFlare too
|
||||||
|
|
||||||
SETTINGS_FILENAME = '/site_settings.json'
|
SETTINGS_FILENAME = '/site_settings.json'
|
||||||
LOG_DIRECTORY = '/var/log/rdrama'
|
|
||||||
|
|
||||||
DEFAULT_RATELIMIT = "3/second;30/minute;200/hour;1000/day"
|
DEFAULT_RATELIMIT = "3/second;30/minute;200/hour;1000/day"
|
||||||
DEFAULT_RATELIMIT_SLOWER = "1/second;30/minute;200/hour;1000/day"
|
DEFAULT_RATELIMIT_SLOWER = "1/second;30/minute;200/hour;1000/day"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
cd /rDrama
|
cd /rDrama
|
||||||
|
|
||||||
. /env
|
. /env
|
||||||
PATH="${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}"
|
PATH="${NVM_DIRECTORY}/versions/node/v${NODE_VERSION}/bin/:${PATH}"
|
||||||
|
|
||||||
cd ./chat
|
cd ./chat
|
||||||
yarn install
|
yarn install
|
||||||
|
|
|
@ -35,9 +35,9 @@ pip3 install -r requirements.txt
|
||||||
|
|
||||||
apt -y install curl
|
apt -y install curl
|
||||||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
|
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
|
||||||
. "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
|
. "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION}
|
||||||
. "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
|
. "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION}
|
||||||
. "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
|
. "$NVM_DIRECTORY/nvm.sh" && nvm alias default v${NODE_VERSION}
|
||||||
PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
|
PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
|
||||||
node --version
|
node --version
|
||||||
npm --version
|
npm --version
|
||||||
|
|
Loading…
Reference in New Issue