self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-07-17 01:32:29 +02:00
Code Issues Releases Activity

Use a dictionary of db connection string templates

Browse Source
This commit is contained in:
kaiyou
2018-12-10 15:30:53 +01:00
parent 19f18e2240
commit 8707b0fcd7
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,10 @@ DEFAULT_CONFIG = {
'DOMAIN_REGISTRATION': False, 'DOMAIN_REGISTRATION': False,
'TEMPLATES_AUTO_RELOAD': True, 'TEMPLATES_AUTO_RELOAD': True,
# Database settings # Database settings
'DB_FLAVOR': 'sqlite', 'DB_FLAVOR': None,
'DB_USER': 'mailu', 'DB_USER': 'mailu',
'DB_PW': '', 'DB_PW': None,
'DB_URL': 'database', 'DB_HOST': 'database',
'DB_NAME': 'mailu', 'DB_NAME': 'mailu',
'SQLALCHEMY_DATABASE_URI': 'sqlite:////data/main.db', 'SQLALCHEMY_DATABASE_URI': 'sqlite:////data/main.db',
'SQLALCHEMY_TRACK_MODIFICATIONS': False, 'SQLALCHEMY_TRACK_MODIFICATIONS': False,
@ -64,31 +64,30 @@ class ConfigManager(dict):
""" Naive configuration manager that uses environment only """ Naive configuration manager that uses environment only
""" """
DB_TEMPLATES = {
'sqlite': 'sqlite:////{DB_HOST}',
'postgresql': 'postgresql://{DB_USER}:{DB_PW}@{DB_HOST}/{DB_NAME}',
'mysql': 'mysql://{DB_USER}:{DB_PW}@{DB_HOST}/{DB_NAME}'
}
def __init__(self): def __init__(self):
self.config = dict() self.config = dict()
self.parse_env() self.parse_env()
def init_app(self, app): def init_app(self, app):
self.config.update(app.config) self.config.update(app.config)
self.parse_env() # get environment variables
if self.config['DB_FLAVOR'] != 'sqlite':
self.setsql()
app.config = self
def parse_env(self):
self.config.update({ self.config.update({
key: os.environ.get(key, value) key: os.environ.get(key, value)
for key, value in DEFAULT_CONFIG.items() for key, value in DEFAULT_CONFIG.items()
}) })
if self.config['SQL_FLAVOR'] != 'sqlite' # automatically set the sqlalchemy string
self.setsql() if self.config['DB_FLAVOR']:
template = self.DB_TEMPLATES[self.config['DB_FLAVOR']]
self.config['SQLALCHEMY_DATABASE_URI'] = template.format(**self.config)
# update the app config itself
app.config = self app.config = self
def setsql(self)
if not self.config['DB_PW']
self.config['DB_PW'] = self.config['SECRET_KEY']
self.config['SQLALCHEMY_DATABASE_URI'] = '{driver}://{user}:{pw}@{url}/{db}'.format(driver=DB_FLAVOR,user=DB_USER,pw=DB_PW,url=DB_URL,db=DB_NAME)
def setdefault(self, key, value): def setdefault(self, key, value):
if key not in self.config: if key not in self.config:
self.config[key] = value self.config[key] = value