Merge pull request #3 from themotte/fixing_dev_env

Fixed some bugs likely caused by using a newer version of docker-compose
This commit is contained in:
Michael House 2022-05-02 21:39:52 -05:00 committed by GitHub
commit d827372d62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 36 deletions

66
env
View file

@ -1,33 +1,33 @@
export MASTER_KEY="blahblahblah"
export DOMAIN="localhost"
export SITE_NAME="rDrama"
export GIPHY_KEY="blahblahblah"
export DISCORD_SERVER_ID="blahblahblah"
export DISCORD_CLIENT_ID="blahblahblah"
export DISCORD_CLIENT_SECRET="blahblahblah"
export DISCORD_BOT_TOKEN="blahblahblah"
export HCAPTCHA_SECRET="blahblahblah"
export YOUTUBE_KEY="blahblahblah"
export PUSHER_ID="blahblahblah"
export PUSHER_KEY="blahblahblah"
export IMGUR_KEY="blahblahblah"
export SPAM_SIMILARITY_THRESHOLD="0.5"
export SPAM_URL_SIMILARITY_THRESHOLD="0.1"
export SPAM_SIMILAR_COUNT_THRESHOLD="10"
export COMMENT_SPAM_SIMILAR_THRESHOLD="0.5"
export COMMENT_SPAM_COUNT_THRESHOLD="10"
export DEFAULT_TIME_FILTER="all"
export GUMROAD_TOKEN="blahblahblah"
export GUMROAD_LINK="https://marsey1.gumroad.com/l/tfcvri"
export GUMROAD_ID="tfcvri"
export CARD_VIEW="0"
export DISABLE_DOWNVOTES="0"
export DUES="10"
export DEFAULT_THEME="midnight"
export DEFAULT_COLOR="ff66ac"
export MAIL_USERNAME="blahblahblah@gmail.com"
export MAIL_PASSWORD="blahblahblah"
export DESCRIPTION="rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!"
export CF_KEY="blahblahblah"
export CF_ZONE="blahblahblah"
export DEBIAN_FRONTEND="noninteractive"
MASTER_KEY=blahblahblah
DOMAIN=localhost
SITE_NAME=rDrama
GIPHY_KEY=blahblahblah
DISCORD_SERVER_ID=blahblahblah
DISCORD_CLIENT_ID=blahblahblah
DISCORD_CLIENT_SECRET=blahblahblah
DISCORD_BOT_TOKEN=blahblahblah
HCAPTCHA_SECRET=blahblahblah
YOUTUBE_KEY=blahblahblah
PUSHER_ID=blahblahblah
PUSHER_KEY=blahblahblah
IMGUR_KEY=blahblahblah
SPAM_SIMILARITY_THRESHOLD=0.5
SPAM_URL_SIMILARITY_THRESHOLD=0.1
SPAM_SIMILAR_COUNT_THRESHOLD=10
COMMENT_SPAM_SIMILAR_THRESHOLD=0.5
COMMENT_SPAM_COUNT_THRESHOLD=10
DEFAULT_TIME_FILTER=all
GUMROAD_TOKEN=blahblahblah
GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri
GUMROAD_ID=tfcvri
CARD_VIEW=0
DISABLE_DOWNVOTES=0
DUES=10
DEFAULT_THEME=midnight
DEFAULT_COLOR=ff66ac
MAIL_USERNAME=blahblahblah@gmail.com
MAIL_PASSWORD=blahblahblah
DESCRIPTION=DESCRIPTION GOES HERE
CF_KEY=blahblahblah
CF_ZONE=blahblahblah
DEBIAN_FRONTEND=noninteractive

View file

@ -1,3 +1,4 @@
import gevent.monkey
gevent.monkey.patch_all()
from os import environ, path
@ -33,7 +34,7 @@ app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 3153600
app.config["SESSION_COOKIE_NAME"] = "session_" + environ.get("SITE_NAME").strip().lower()
app.config["VERSION"] = "1.0.0"
app.config['MAX_CONTENT_LENGTH'] = 16 * 1024 * 1024
app.config["SESSION_COOKIE_SECURE"] = True
app.config["SESSION_COOKIE_SECURE"] = True
app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365
app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip()
@ -54,7 +55,7 @@ app.config['MAIL_PORT'] = 587
app.config['MAIL_USE_TLS'] = True
app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip()
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "DESCRIPTION GOES HERE").strip()
app.config['SETTINGS'] = {}
r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)
@ -120,4 +121,4 @@ def after_request(response):
if "load_chat" in argv:
from files.routes.chat import *
else:
from files.routes import *
from files.routes import *