From 5b0cd1d22f805ec4db81a9080fc8f4e7c851330b Mon Sep 17 00:00:00 2001 From: finn Date: Sat, 3 Aug 2024 08:58:32 -0700 Subject: [PATCH] checkpoint before maillog attempt --- backend/app/__init__.py | 2 ++ backend/config.py | 7 +++++++ compose.yaml | 1 + proxy/baseconf | 4 ++++ proxy/conf | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 2ea3d48..52c9951 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -3,6 +3,8 @@ from config import Config from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate from flask_login import LoginManager +import logging +from logging.handlers import SMTPHandler app = Flask(__name__) app.config.from_object(Config) diff --git a/backend/config.py b/backend/config.py index 8bcfc52..b2449f9 100644 --- a/backend/config.py +++ b/backend/config.py @@ -8,4 +8,11 @@ class Config: #SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'zapp.db') SQLALCHEMY_DATABASE_URI = 'mariadb+mariadbconnector://flasku:' + os.environ.get('MYSQL_PASSWORD') + '@db:3306/flask' + MAIL_SERVER = 'pmb' + MAIL_PORT = 25 + MAIL_USE_TLS = False + MAIL_USERNAME = '' + MAIL_PASSWORD = '' + ADMINS = [os.environ.get('ADMIN_EMAIL')] + diff --git a/compose.yaml b/compose.yaml index 7ceb7ff..f7b45ba 100644 --- a/compose.yaml +++ b/compose.yaml @@ -37,6 +37,7 @@ services: - MYSQL_PASSWORD=${DOTENV_MYSQL_FLASK_PASSWORD} - TOKEN_I=${DOTENV_TOKEN_I} - TOKEN_C=${DOTENV_TOKEN_C} + - ADMIN_EMAIL=${ADMIN_EMAIL} #ports: # - 8000:8000 expose: diff --git a/proxy/baseconf b/proxy/baseconf index f6d2195..04abcd7 100755 --- a/proxy/baseconf +++ b/proxy/baseconf @@ -4,5 +4,9 @@ server { location / { proxy_pass http://backend:8000; } + location /gutty{ + proxy_pass http://gitea:3000; + } + } diff --git a/proxy/conf b/proxy/conf index f6d2195..fe29397 100755 --- a/proxy/conf +++ b/proxy/conf @@ -4,5 +4,9 @@ server { location / { proxy_pass http://backend:8000; } + location /gutty { + proxy_pass http://gitea:3000; + } + }