diff options
author | Daniel Hansson <mailto@danielhansson.nu> | 2022-08-18 22:09:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-18 22:09:43 +0300 |
commit | 00ac5ea7b5c1f113f597b952bf4ea477b88fad1c (patch) | |
tree | b85b0c9b2bfcc9874ab9455fa2e353a392ff3e0f | |
parent | 76c14f61a887b22d78fb1073b471c62ba886005e (diff) |
a few more fixes to FTS
- Fix parsing error
- Set correct permissions for cert files
- Purge docker-compse on removal or reinstall
Signed-off-by: Daniel Hansson <mailto@danielhansson.nu>
-rw-r--r-- | apps/fulltextsearch.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index b154a08d..0188ccad 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -59,6 +59,7 @@ else rm -rf "$OPNSDIR" # Show successful uninstall if applicable removal_popup "$SCRIPT_NAME" + apt-get purge docker-compose -y fi # Test RAM size (4GB min) + CPUs (min 2) @@ -235,7 +236,7 @@ if [ "$(nproc)" -gt 2 ] then countdown "Waiting for Docker bootstrapping..." "60" else - countdown "Waiting for Docker bootstrapping..." 120" + countdown "Waiting for Docker bootstrapping..." "120" fi # Make sure password setup is enforced. @@ -249,7 +250,8 @@ docker-compose exec fts_os-node \ -nhnv \ -cacert ../../../config/root-ca.pem \ -cert ../../../config/admin.pem \ - -key ../../../config/admin-key.pem" + -key ../../../config/admin-key.pem && \ + chmod 0600 ../../../config/root-ca.pem ../../../config/admin.pem ../../../config/admin-key.pem" docker logs $fts_node @@ -263,6 +265,7 @@ chown -R www-data:www-data $NC_APPS_PATH nextcloud_occ fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}' nextcloud_occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://${INDEX_USER}:${OPNSREST}@localhost:9200\",\"elastic_index\":\"${INDEX_USER}-index\"}" nextcloud_occ files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}" + # Wait further for cache for index to work countdown "Waiting for a few seconds before indexing starts..." "10" if nextcloud_occ fulltextsearch:test @@ -272,7 +275,7 @@ then msg_box "Full Text Search was successfully installed!" fi else - msg_box "There seems to be an issue with the FTS test. Please report this to $ISSUES" + msg_box "There seems to be an issue with the Full Text Search test. Please report this to $ISSUES." fi # Make sure the script exists |