eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

adjust a few things

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-06-27 11:51:53 +02:00
parent faa5947963
commit 2dfab2941b
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/fulltextsearch/Dockerfile
View file

@ -1,5 +1,5 @@
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:8.7.1 FROM elasticsearch:8.8.0
USER root USER root

2
Containers/nextcloud/entrypoint.sh
View file

@ -677,7 +677,7 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
php /var/www/html/occ app:update files_fulltextsearch php /var/www/html/occ app:update files_fulltextsearch
fi fi
php /var/www/html/occ fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}' php /var/www/html/occ fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}'
php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://$FULLTEXTSEARCH_HOST:9200\",\"elastic_index\":\"nextcloud-aio\"}" php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://elastic:$ELASTIC_PASSWORD@$FULLTEXTSEARCH_HOST:9200\",\"elastic_index\":\"nextcloud-aio\"}"
php /var/www/html/occ files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}" php /var/www/html/occ files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}"
# Do the index # Do the index

21
php/containers.json
View file

@ -113,7 +113,8 @@
"REDIS_PASSWORD", "REDIS_PASSWORD",
"NEXTCLOUD_PASSWORD", "NEXTCLOUD_PASSWORD",
"TURN_SECRET", "TURN_SECRET",
"SIGNALING_SECRET" "SIGNALING_SECRET",
"ELASTIC_PASSWORD"
], ],
"volumes": [ "volumes": [
{ {
@ -180,7 +181,8 @@
"INSTALL_LATEST_MAJOR=%INSTALL_LATEST_MAJOR%", "INSTALL_LATEST_MAJOR=%INSTALL_LATEST_MAJOR%",
"TALK_RECORDING_ENABLED=%TALK_RECORDING_ENABLED%", "TALK_RECORDING_ENABLED=%TALK_RECORDING_ENABLED%",
"RECORDING_SECRET=%RECORDING_SECRET%", "RECORDING_SECRET=%RECORDING_SECRET%",
"TALK_RECORDING_HOST=nextcloud-aio-talk-recording" "TALK_RECORDING_HOST=nextcloud-aio-talk-recording",
"ELASTIC_PASSWORD=%ELASTIC_PASSWORD%"
], ],
"restart": "unless-stopped", "restart": "unless-stopped",
"devices": [ "devices": [
@ -501,16 +503,14 @@
"environment": [ "environment": [
"POSTGRES_HOST=nextcloud-aio-database", "POSTGRES_HOST=nextcloud-aio-database",
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"ES_JAVA_OPTS=-Xms1024M -Xmx1024M -Des.enforce.bootstrap.checks=true", "ELASTIC_PASSWORD=%ELASTIC_PASSWORD%",
"xpack.license.self_generated.type=basic", "ES_JAVA_OPTS=-Xms512M -Xmx512M -Des.enforce.bootstrap.checks=true",
"xpack.security.enabled=false",
"xpack.watcher.enabled=false",
"xpack.graph.enabled=false",
"xpack.ml.enabled=false",
"bootstrap.memory_lock=true", "bootstrap.memory_lock=true",
"cluster.name=nextcloud-aio", "cluster.name=nextcloud-aio",
"discovery.type=single-node", "discovery.type=single-node",
"thread_pool.write.queue_size=1000" "http.port=9200",
"xpack.license.self_generated.type=basic",
"xpack.security.enabled=false"
], ],
"volumes": [ "volumes": [
{ {
@ -525,6 +525,9 @@
], ],
"networks": [ "networks": [
"nextcloud-aio" "nextcloud-aio"
],
"secrets": [
"ELASTIC_PASSWORD"
] ]
} }
] ]