From 8b161f948e2c0aa0f9b27d2778bb9f4469b8346d Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 5 May 2021 19:36:46 +0300 Subject: [PATCH 1/3] Add usePreciseSubqueries property to example.runtime.properties (#233) --- .../resources/config/example.runtime.properties | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index 260eb17f..366cfeb8 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -110,6 +110,22 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId # #externalAuth.netIdHeaderName = remote_userID +# ----------------------------------------------------------------------------- +# OPTIMIZING LIST VIEW QUERIES +# ----------------------------------------------------------------------------- + + # + # Include sections between + # tags when executing 'list view' queries that retrieve data + # for property lists on profile pages. + # + # Including these optional sections does not change the query + # semantics, but may improve performance. + # + # Default is true if not set. + # (Prior to v1.12, default was true for SDB and false for TDB.) + # +# listview.usePreciseSubquery = true # ----------------------------------------------------------------------------- # TUNING THE DATABASE CONNECTION POOL @@ -128,7 +144,6 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId # # VitroConnection.DataSource.pool.maxIdle = 10 - # ----------------------------------------------------------------------------- # USING A DIFFERENT DATABASE # ----------------------------------------------------------------------------- From 5d257cae6bace39af29278dadaf2015a6ca8ee45 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 7 May 2021 02:46:57 -0600 Subject: [PATCH 2/3] [VIVO-1982] - Set default email params to blank (#238) * Set default email params to blank * Comment out email settings --- home/src/main/resources/config/example.runtime.properties | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index 366cfeb8..7dfda99e 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -71,8 +71,12 @@ argon2.time = 1000 # Email parameters which VIVO can use to send mail. If these are left empty, # the "Contact Us" form will be disabled and users will not be notified of # changes to their accounts. -# email.smtpHost = smtp.mydomain.edu -# email.replyTo = vivoAdmin@mydomain.edu + # Example: + # email.smtpHost = smtp.mydomain.edu + # email.replyTo = vivoAdmin@mydomain.edu + # +# email.smtpHost = +# email.replyTo = # # URL of Solr context used in local VIVO search. This will usually consist of: From 631986a2d58c86c0913de350c2b467bb0eadb253 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Tue, 11 May 2021 18:07:53 +0300 Subject: [PATCH 3/3] Issue/vivo 1981 (#239) * Replace hardcoded en locale with current locale in lang attributes * Update README with current wiki link; add details to Docker Compose installation instructino. --- README.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3b7f6598..08fc328a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ https://wiki.duraspace.org/display/VIVO/ ### Installation Instructions Installation instructions for the latest release can be found at this location on the wiki: -https://wiki.duraspace.org/display/VIVODOC110x/Installing+VIVO +https://wiki.duraspace.org/display/VIVODOC112x/Installing+VIVO ### Docker @@ -27,7 +27,7 @@ VIVO docker container is available at [vivoweb/vivo](https://hub.docker.com/repo ### Docker Compose -Docker Compose environment variables. +Docker Compose environment variables: .env defaults ``` @@ -36,12 +36,25 @@ RESET_HOME=false RESET_CORE=false ``` -- `LOCAL_VIVO_HOME`: VIVO home directory on your host machine which will mount to volume in docker container. -- `RESET_HOME`: Convinience to reset VIVO home when starting container. **Caution**, will delete local configuration, content, and configuration model. -- `RESET_CORE`: Convinience to reset VIVO Solr core when starting container. **Caution**, will require complete reindex. +- `LOCAL_VIVO_HOME`: VIVO home directory on your host machine which will mount to volume in docker container. Set this environment variable to persist your VIVO data on your host machine. +- `RESET_HOME`: Convenience to reset VIVO home when starting container. **Caution**, will delete local configuration, content, and configuration model. +- `RESET_CORE`: Convenience to reset VIVO Solr core when starting container. **Caution**, will require complete reindex. + +Before building VIVO, you will also need to clone (and switch to the same branch, if other than main) of [Vitro](https://github.com/vivo-project/Vitro). The Vitro project must be cloned to a sibling directory next to VIVO so that it can be found during the build. You will also need to clone (and switch to the appropriate branch) of [Vitro-languages](https://github.com/vivo-project/Vitro-languages) and [VIVO-languages](https://github.com/vivo-project/VIVO-languages). Build and start VIVO. +1. In Vitro-languages, run: +``` +mvn install +``` + +2. In VIVO-languages, run: +``` +mvn install +``` + +3. In VIVO (with Vitro cloned alongside it), run: ``` mvn clean package -s installer/example-settings.xml docker-compose up