Merge "docker: don't override horizon::vhost_extra_params"

This commit is contained in:
Zuul 2018-02-17 22:23:13 +00:00 committed by Gerrit Code Review
commit b80b208359
2 changed files with 1 additions and 5 deletions

View File

@ -67,11 +67,6 @@ outputs:
config_settings:
map_merge:
- get_attr: [HorizonBase, role_data, config_settings]
- horizon::vhost_extra_params:
add_listen: true
priority: 10
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
options: ['FollowSymLinks','MultiViews']
- horizon::secure_cookies: false
logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}

View File

@ -79,6 +79,7 @@ parameters:
services in the internal network.
HorizonVhostExtraParams:
default:
add_listen: true
priority: 10
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
options: ['FollowSymLinks','MultiViews']