mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Improved support for read-only config directory

Browse Source
This commit is contained in:
krateng 2022-04-04 16:18:06 +02:00
parent acc08693b3
commit 153ab41ce7
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
maloja/globalconf.py
View File

@ -15,10 +15,9 @@ from .__pkginfo__ import VERSION
# DIRECRORY_CONFIG, DIRECRORY_STATE, DIRECTORY_LOGS and DIRECTORY_CACHE # DIRECRORY_CONFIG, DIRECRORY_STATE, DIRECTORY_LOGS and DIRECTORY_CACHE
# config can only be determined by environment variable, the others can be loaded # config can only be determined by environment variable, the others can be loaded
# from the config files # from the config files
# explicit settings will always be respected. if there are none: # explicit settings will always be respected, fallback to default
# first check if there is any indication of one of the possibilities being populated already
# if not, use the first we have permissions for # if default isn't usable, and config writable, find alternative and fix it in settings
# after we decide which to use, fix it in settings to avoid future heuristics
# USEFUL FUNCS # USEFUL FUNCS
pthj = os.path.join pthj = os.path.join
@ -205,35 +204,41 @@ malojaconfig = Configuration(
) )
if found_new_config_dir: if found_new_config_dir:
malojaconfig["DIRECTORY_CONFIG"] = maloja_dir_config try:
malojaconfig["DIRECTORY_CONFIG"] = maloja_dir_config
except PermissionError as e:
pass
# this really doesn't matter because when are we gonna load info about where # this really doesn't matter because when are we gonna load info about where
# the settings file is stored from the settings file # the settings file is stored from the settings file
# but oh well # but oh well
malojaconfig.render_help(pthj(maloja_dir_config,"settings.md"), try:
top_text='''If you wish to adjust settings in the settings.ini file, do so while the server malojaconfig.render_help(pthj(maloja_dir_config,"settings.md"),
is not running in order to avoid data being overwritten. top_text='''If you wish to adjust settings in the settings.ini file, do so while the server
is not running in order to avoid data being overwritten.
Technically, each setting can be set via environment variable or the settings Technically, each setting can be set via environment variable or the settings
file - simply add the prefix `MALOJA_` for environment variables. It is recommended file - simply add the prefix `MALOJA_` for environment variables. It is recommended
to use the settings file where possible and not configure each aspect of your to use the settings file where possible and not configure each aspect of your
server via environment variables! server via environment variables!
You also can specify additional settings in the files`/run/secrets/maloja.yml` or You also can specify additional settings in the files`/run/secrets/maloja.yml` or
`/run/secrets/maloja.ini`, as well as their values directly in files of the respective `/run/secrets/maloja.ini`, as well as their values directly in files of the respective
name in `/run/secrets/` (e.g. `/run/secrets/lastfm_api_key`).''') name in `/run/secrets/` (e.g. `/run/secrets/lastfm_api_key`).''')
except PermissionError as e:
pass
### STEP 3 - check all possible folders for files (old installation) ### STEP 3 - check all possible folders for files (old installation)
if not malojaconfig.readonly:
for datatype in ("state","cache","logs"): for datatype in ("state","cache","logs"):
# obviously default values shouldn't trigger this # obviously default values shouldn't trigger this
# if user has nothing specified, we need to use this # if user has nothing specified, we need to use this
if malojaconfig.get_specified(directory_info[datatype]['setting']) is None and malojaconfig.get_specified('DATA_DIRECTORY') is None: if malojaconfig.get_specified(directory_info[datatype]['setting']) is None and malojaconfig.get_specified('DATA_DIRECTORY') is None:
find_good_folder(datatype,malojaconfig) find_good_folder(datatype,malojaconfig)