globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Configuration in its own dir

Browse source
This commit is contained in:
Éloi Rivard 2020-08-27 15:30:21 +02:00
parent 47c594d911
commit f587eb4093
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.sample.toml → conf/config.sample.toml
View file

@ -6,7 +6,8 @@ NAME = "MyDomain"
LANGUAGE = "en" LANGUAGE = "en"
# Path to the RFC8414 metadata file # Path to the RFC8414 metadata file
OAUTH2_METADATA_FILE = "oauth-authorization-server" OAUTH2_METADATA_FILE = "conf/oauth-authorization-server"
OIDC_METADATA_FILE = "conf/openid_configuration"
[LDAP] [LDAP]
URI = "ldap://ldap" URI = "ldap://ldap"

0
oauth-authorization-server → conf/oauth-authorization-server
View file

6
web/__init__.py
View file

@ -28,8 +28,10 @@ def create_app(config=None):
app.config.from_mapping(config) app.config.from_mapping(config)
elif "CONFIG" in os.environ: elif "CONFIG" in os.environ:
app.config.from_mapping(toml.load(os.environ.get("CONFIG"))) app.config.from_mapping(toml.load(os.environ.get("CONFIG")))
elif os.path.exists("config.toml"): elif os.path.exists("conf/config.toml"):
app.config.from_mapping(toml.load("config.toml")) app.config.from_mapping(toml.load("conf/config.toml"))
else:
raise Exception("No configuration file found.")
setup_app(app) setup_app(app)
return app return app