Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addons/deSEC/desec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ done
new_domain_email_info_1(){
### TODO, is it possible to check if the email address already exists with deSEC? In that case we could skip this whole info and replace it with a function instead.
# Email address
msg_box "You will now be prompted to enter an email address. It's very important that the email address you enter it a 100% valid one! deSEC will verify your email address by sending you a verification link.
msg_box "You will now be prompted to enter an email address. It's very important that the email address you enter is a 100% valid one! deSEC will verify your email address by sending you a verification link.

Every 6 months you will get an email asking you to confirm your domain. If you don't react within a few weeks, your domain will be destroyed!

Expand Down Expand Up @@ -134,10 +134,10 @@ EOF

prompt_tls(){
# Ask if the user wants to add TLS (use script)
if yesno_box_yes "Do you want to set this domain as your Nextcoud domain \
if yesno_box_yes "Do you want to set this domain as your Nextcloud domain \
and activate TLS for your Nextcloud using Let's Encrypt?"
then
# Add DNS renewals with the deSEC hoock script
# Add DNS renewals with the deSEC hook script
print_text_in_color "$ICyan" "Preparing for DNS-renewals..."
mkdir -p "$SCRIPTS"/deSEC
curl_to_dir "https://raw.githubusercontent.com/nextcloud/vm/main/addons/deSEC" "hook.sh" "$SCRIPTS"/deSEC
Expand Down
6 changes: 3 additions & 3 deletions apps/fulltextsearch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

true
SCRIPT_NAME="Full Text Search"
SCRIPT_EXPLAINER="Full Text Search provides ElastichSearch for Nextcloud, which makes it possible to search for text inside files."
SCRIPT_EXPLAINER="Full Text Search provides ElasticSearch for Nextcloud, which makes it possible to search for text inside files."
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh

Expand Down Expand Up @@ -66,7 +66,7 @@ else
nextcloud_occ app:remove "$app"
fi
done
# Removal Elastichsearch Docker image
# Removal Elasticsearch Docker image
docker_prune_this "docker.elastic.co/elasticsearch/elasticsearch"
if docker network ls | grep "$FULLTEXTSEARCH_IMAGE_NAME"-network
then
Expand Down Expand Up @@ -220,7 +220,7 @@ countdown "Waiting for a few seconds before indexing starts..." "10"
if nextcloud_occ fulltextsearch:test
then
# Turn off swap temporarily https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html
print_text_in_color "Turning of swap temporarily..."
print_text_in_color "Turning off swap temporarily..."
swapoff -a
if nextcloud_occ fulltextsearch:index < /dev/null
then
Expand Down
14 changes: 7 additions & 7 deletions apps/imaginary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
true
SCRIPT_NAME="Imaginary Docker"
SCRIPT_EXPLAINER="This script will install Imaginary which is a replacement for the less secure Imagick.
It can speedup the loading of previews in Nextcloud a lot."
It can speed up the loading of previews in Nextcloud a lot."
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh

Expand All @@ -20,7 +20,7 @@ debug_mode
# Check if root
root_check

# Check recources
# Check resources
# If we can calculate the cpu and ram, then set it to the lowest possible, if not, then hardcode it to a recommended minimum.
if which nproc >/dev/null 2>&1
then
Expand All @@ -43,7 +43,7 @@ else
# Ask for removal or reinstallation
reinstall_remove_menu "$SCRIPT_NAME"
# Removal
if yesno_box_yes "Do you want to remove the Imaginary and all it's settings?"
if yesno_box_yes "Do you want to remove the Imaginary and all its settings?"
then
# Remove docker container
docker_prune_this 'nextcloud/aio-imaginary' 'imaginary'
Expand Down Expand Up @@ -72,13 +72,13 @@ fi
# Remove everything that is related to previewgenerator
if crontab -u www-data -l | grep -q "preview:pre-generate"
then
if yesno_box_yes "We noticed that you have Preview Generator enabled. Imagniary replaces this, and the old app Preview Generator is now legacy.\nWe recommend you to remove it. Do you want to do that?"
if yesno_box_yes "We noticed that you have Preview Generator enabled. Imaginary replaces this, and the old app Preview Generator is now legacy.\nWe recommend you to remove it. Do you want to do that?"
then
# Remove the app
nextcloud_occ_no_check app:remove previewgenerator
# Remove the cronjob
crontab -u www-data -l | grep -v 'preview:pre-generate' | crontab -u www-data -
# Remove dependecies
# Remove dependencies
DEPENDENCY=(php-imagick php"$PHPVER"-imagick libmagickcore-6.q16-3-extra imagemagick-6.q16-extra)
for installeddependency in "${DEPENDENCY[@]}"
do
Expand All @@ -92,7 +92,7 @@ then
rm -rf /etc/ImageMagick-6
# Remove previews
if yesno_box_yes "Do you want to remove all previews that were generated until now?
This will most likely clear a lot of space! Also, pre-generated previews are not needed anymore once Imaginary are installed."
This will most likely clear a lot of space! Also, pre-generated previews are not needed anymore once Imaginary is installed."
then
countdown "Removing the preview folder. This can take a while..." "5"
rm -rfv "$NCDATA"/appdata_*/preview/*
Expand All @@ -115,7 +115,7 @@ docker pull ghcr.io/nextcloud-releases/aio-imaginary:latest
docker run -t -d -p 127.0.0.1:9000:9000 --restart always --name imaginary ghcr.io/nextcloud-releases/aio-imaginary –cap-add=sys_nice -concurrency 50 -enable-url-source -return-size -log-level debug

# Test if imaginary is working
countdown "Testing if it works in 3 sedonds" "3"
countdown "Testing if it works in 3 seconds" "3"
if curl -O "http://127.0.0.1:9000/crop?width=500&height=400&url=https://raw.githubusercontent.com/h2non/imaginary/master/testdata/large.jpg"
then
print_text_in_color "$IGreen" "imaginary seems to be working OK!"
Expand Down
2 changes: 1 addition & 1 deletion not-supported/ntfs-mount.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ If you want to cancel, type 'exit' and press [ENTER].")
msg_box "Please don't use spaces!"
elif ! echo "$MOUNT_PATH" | grep -q "^/mnt/"
then
msg_box "The directory has to stat with '/mnt/'"
msg_box "The directory has to start with '/mnt/'"
elif grep -q " $MOUNT_PATH " /etc/fstab
then
msg_box "The mountpoint already exists in fstab. Please try a different one."
Expand Down
2 changes: 1 addition & 1 deletion old/face-recognition.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ram_check 2
cpu_check 2

# Check if facerecognition is already installed
if ! is_app_installed facerecognition && ! is_this_installed php7.4-pdlib && ! is_this_installed php8.1-pdli
if ! is_app_installed facerecognition && ! is_this_installed php7.4-pdlib && ! is_this_installed php8.1-pdlib
then
# Ask for installing
install_popup "$SCRIPT_NAME"
Expand Down