scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-01 10:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add default for WEB_API, re-add flask-restx to deps, remove whitespace

Browse Source
This commit is contained in:
Alexander Graf
2022-12-27 14:28:25 +01:00
parent 3cb8358090
commit be40781394
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/admin/mailu/configuration.py
View File

@@ -69,7 +69,6 @@ DEFAULT_CONFIG = {
'RECAPTCHA_PRIVATE_KEY': '', 'RECAPTCHA_PRIVATE_KEY': '',
'LOGO_URL': None, 'LOGO_URL': None,
'LOGO_BACKGROUND': None, 'LOGO_BACKGROUND': None,
'API': False,
# Advanced settings # Advanced settings
'API': False, 'API': False,
'WEB_API': '/api', 'WEB_API': '/api',

1
core/base/requirements-dev.txt
View File

@@ -15,6 +15,7 @@ Flask-DebugToolbar
Flask-Login Flask-Login
flask-marshmallow flask-marshmallow
Flask-Migrate Flask-Migrate
Flask-RESTX
Flask-SQLAlchemy<3 Flask-SQLAlchemy<3
Flask-WTF Flask-WTF
gunicorn gunicorn

1
core/base/requirements-prod.txt
View File

@@ -25,6 +25,7 @@ Flask-DebugToolbar==0.13.1
Flask-Login==0.6.2 Flask-Login==0.6.2
flask-marshmallow==0.14.0 flask-marshmallow==0.14.0
Flask-Migrate==3.1.0 Flask-Migrate==3.1.0
Flask-RESTX==1.0.3
Flask-SQLAlchemy==2.5.1 Flask-SQLAlchemy==2.5.1
Flask-WTF==1.0.1 Flask-WTF==1.0.1
frozenlist==1.3.1 frozenlist==1.3.1

2
core/nginx/conf/nginx.conf
View File

@@ -245,7 +245,7 @@ http {
{% endif %} {% endif %}
{% if API %} {% if API %}
location ~ {{ WEB_API }} { location ~ {{ WEB_API or '/api' }} {
include /etc/nginx/proxy.conf; include /etc/nginx/proxy.conf;
proxy_pass http://$admin; proxy_pass http://$admin;
} }