Commit 2d0f0a9c authored by Pablo Panero's avatar Pablo Panero
Browse files

Merge branch 'theme' into 'master'

Theme

See merge request ppanero/cern_search_rest!14
parents 3da0289f 4a465c9f
......@@ -17,6 +17,10 @@ secrets/
*.key
*.crt
# Dump files
*.rdb
# Local env source
env.sh
......@@ -25,7 +25,7 @@ WORKDIR /code
ADD . /code
ENV INVENIO_INSTANCE_PATH=/usr/local/var/cernsearch/var/cernsearch-instance
ENV LOGO_PATH=/static/images/cernsearchicon.png
ENV LOGO_PATH=/images/cernsearchicon.png
RUN chmod g=u /etc/passwd && \
chmod +x /code/scripts/*.sh && \
......
......@@ -16,6 +16,11 @@ def _(x):
"""Identity function used to trigger string extraction."""
return x
# Theme
# =====
THEME_SEARCHBAR = False
# OAuth Client
# ============
......
......@@ -23,6 +23,7 @@ http {
# Proxying connections to application servers
location / {
rewrite ^/$ /account/settings/applications/ redirect;
include uwsgi_params;
uwsgi_pass uwsgicluster;
......
......@@ -15,4 +15,4 @@ cd ${INVENIO_INSTANCE_PATH}/static
npm install
invenio collect -v
invenio assets build
mv /code/${LOGO_PATH} ${INVENIO_INSTANCE_PATH}/${LOGO_PATH}
mv /code/static/${LOGO_PATH} ${INVENIO_INSTANCE_PATH}/static/${LOGO_PATH}
......@@ -307,6 +307,7 @@ objects:
# Proxying connections to application servers
location / {
rewrite ^/$ /account/settings/applications/ redirect;
include uwsgi_params;
uwsgi_pass cern-search-api:5000;
......@@ -349,5 +350,5 @@ parameters:
description: "CERN Search site name (E.g. EDMS, Indico, etc.)"
required: true
- name: LOGO_PATH
description: "CERN Search site logo. Default path is /code/images/"
description: "CERN Search site logo (E.g. /images/cernsearchicon.png)"
required: true
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment