diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-12 22:33:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-12 22:33:33 +0000 |
| commit | 4902600dd1fd03a6e70c26e7b5153fec8358c29d (patch) | |
| tree | c6b6caf9ff7051314e8d9a7e52c220ce16569376 | |
| parent | efba033351d6a8274e7eec6a064e68d3150a78c4 (diff) | |
| parent | de1b7966d42b974e38a66bb6a3d8141f5ed317fd (diff) | |
Merge "Fix scope of vhost template variables"
| -rw-r--r-- | templates/dual-elasticsearch.vhost.erb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/templates/dual-elasticsearch.vhost.erb b/templates/dual-elasticsearch.vhost.erb index 951d5c6..3f4fc67 100644 --- a/templates/dual-elasticsearch.vhost.erb +++ b/templates/dual-elasticsearch.vhost.erb | |||
| @@ -21,15 +21,15 @@ | |||
| 21 | # as well as arbitrary searches using the elasticsearch search api. | 21 | # as well as arbitrary searches using the elasticsearch search api. |
| 22 | RewriteEngine on | 22 | RewriteEngine on |
| 23 | RewriteCond %{REQUEST_METHOD} GET | 23 | RewriteCond %{REQUEST_METHOD} GET |
| 24 | RewriteRule ^<%= @elasticsearch_prefix %>((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping(/field(/.*)?)?|_cluster/(health|state(/.*)?)|_nodes(/stats)?)$ <%= @elasticsearch_url %>/$1 [P] | 24 | RewriteRule ^<%= scope.lookupvar('::kibana::js::elasticsearch_prefix') %>((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping(/field(/.*)?)?|_cluster/(health|state(/.*)?)|_nodes(/stats)?)$ <%= scope.lookupvar('::kibana::js::elasticsearch_url') %>/$1 [P] |
| 25 | RewriteCond %{REQUEST_METHOD} POST | 25 | RewriteCond %{REQUEST_METHOD} POST |
| 26 | RewriteRule ^<%= @elasticsearch_prefix %>(_aliases|(.*/)?_search)$ <%= @elasticsearch_url %>/$1 [P] | 26 | RewriteRule ^<%= scope.lookupvar('::kibana::js::elasticsearch_prefix') %>(_aliases|(.*/)?_search)$ <%= scope.lookupvar('::kibana::js::elasticsearch_url') %>/$1 [P] |
| 27 | RewriteCond %{REQUEST_METHOD} OPTIONS | 27 | RewriteCond %{REQUEST_METHOD} OPTIONS |
| 28 | RewriteRule ^<%= @elasticsearch_prefix %>((.*/)?_search)$ <%= @elasticsearch_url %>/$1 [P] | 28 | RewriteRule ^<%= scope.lookupvar('::kibana::js::elasticsearch_prefix') %>((.*/)?_search)$ <%= scope.lookupvar('::kibana::js::elasticsearch_url') %>/$1 [P] |
| 29 | <Proxy <%= @elasticsearch_url %>/> | 29 | <Proxy <%= scope.lookupvar('::kibana::js::elasticsearch_url') %>/> |
| 30 | ProxySet connectiontimeout=<%= @vhost_proxy_connect_timeout %> timeout=<%= @vhost_proxy_timeout %> | 30 | ProxySet connectiontimeout=<%= scope.lookupvar('::kibana::js::vhost_proxy_connect_timeout') %> timeout=<%= scope.lookupvar('::kibana::js::vhost_proxy_timeout') %> |
| 31 | </Proxy> | 31 | </Proxy> |
| 32 | ProxyPassReverse <%= @elasticsearch_prefix %> <%= @elasticsearch_url %>/ | 32 | ProxyPassReverse <%= scope.lookupvar('::kibana::js::elasticsearch_prefix') %> <%= scope.lookupvar('::kibana::js::elasticsearch_url') %>/ |
| 33 | </IfModule> | 33 | </IfModule> |
| 34 | 34 | ||
| 35 | DocumentRoot <%= @docroot %> | 35 | DocumentRoot <%= @docroot %> |