Merge pull request #1956 from droopy4096/devel

allow nginx config extension

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-11 22:38:36 +00:00
committed by GitHub
3 changed files with 10 additions and 1 deletions

View File

@@ -118,3 +118,9 @@ secret_key=awxsecret
# /etc/pki/ca-trust in the awx_task and awx_web containers.
# NOTE: only obeyed in local_docker install
#ca_trust_dir=/etc/pki/ca-trust
# Include /etc/nginx/awx_extra.conf
# Note the use of glob pattern for nginx
# which makes include "optional" - i.e. not fail
# if file is absent
#extra_nginx_include="/etc/nginx/awx_extra[.]conf"