diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-12-02 09:10:41 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-02-22 08:07:48 +0000 |
| commit | fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25 (patch) | |
| tree | faf107dfdb15e1eb26667620f8b0faaaf84500e2 /doc | |
| parent | cf25ea7e300cdada57bd964acb4393cc11ad333e (diff) | |
| download | freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.gz freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.xz freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.zip | |
scripts, tests: explicitly set confdir in the rest of server code
Commit 1e6a204b4372bbbfb722a00370a5ce4e34406b9f added explicit confdir
setting to api.bootstrap() calls of a randomly selected portion of
server-side scripts and tests. This commit adds it to the rest of
server-side code for consistency.
https://fedorahosted.org/freeipa/ticket/6389
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide/wsgi.py.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/guide/wsgi.py.txt b/doc/guide/wsgi.py.txt index 8566a25a1..1b72516a5 100644 --- a/doc/guide/wsgi.py.txt +++ b/doc/guide/wsgi.py.txt @@ -1,3 +1,4 @@ +from ipaplatform.paths import paths from ipalib import api from ipalib.config import Env from ipalib.constants import DEFAULT_CONFIG @@ -6,11 +7,12 @@ from ipalib.constants import DEFAULT_CONFIG # by reading in the configuration file(s). The server always reads # default.conf and will also read in `context'.conf. env = Env() -env._bootstrap(context='server', log=None) +env._bootstrap(context='server', log=None, confdir=paths.ETC_IPA) env._finalize_core(**dict(DEFAULT_CONFIG)) # Initialize the API with the proper debug level -api.bootstrap(context='server', debug=env.debug, log=None) (ref:wsgi-app-bootstrap) +api.bootstrap(context='server', confdir=paths.ETC_IPA, + debug=env.debug, log=None) (ref:wsgi-app-bootstrap) try: api.finalize() (ref:wsgi-app-finalize) except Exception as e: |