diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile index c68513f4..9aaa9874 100644 --- a/ecep_cms/Dockerfile +++ b/ecep_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.12.0-beta.3 -FROM taccwma/core-cms:aba079b +# TACC/Core-CMS#743 (v4.2.0 candidate) +FROM taccwma/core-cms:826aede WORKDIR /code diff --git a/ecep_cms/src/taccsite_cms/settings_custom.py b/ecep_cms/src/taccsite_cms/settings_custom.py index c397c059..259ad69f 100644 --- a/ecep_cms/src/taccsite_cms/settings_custom.py +++ b/ecep_cms/src/taccsite_cms/settings_custom.py @@ -82,7 +82,9 @@ # TACC: SEARCH ######################## -SEARCH_QUERY_PARAM_NAME = 'q' +# Support Google search instead of Portal's Elasticsearch +SEARCH_PATH = '/site-search' # cuz Portal Nginx config hijacks /search +SEARCH_QUERY_PARAM_NAME = 'q' # as Google expects ######################## # TACC: PORTAL