From e49203249b8842e3586c7893ab59fd1bf779da20 Mon Sep 17 00:00:00 2001 From: Tobias K <6317548+theCalcaholic@users.noreply.github.com> Date: Mon, 2 Aug 2021 23:49:40 +0200 Subject: nextcloud.conf.sh: Allow any user name for metrics endpoint and fix docker build Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> nextcloud.conf.sh: Fix apps overwriting each other during templating Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> nextcloud.conf.sh: Make --default mode failsafe (don't expect apps to be installed) Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> nextcloud.conf.sh: Allow any user name for metrics endpoint Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> nextcloudpi/Dockerfile: Copy the templates directory to the container Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> lamp/Dockerfile: Copy the templates directory to the container Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> install.sh: Ensure templates are available before executing nc-nextcloud.sh Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com> --- bin/ncp/CONFIG/nc-nextcloud.sh | 4 ++-- bin/ncp/NETWORKING/letsencrypt.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh index fa522a57..f9e2c0c1 100644 --- a/bin/ncp/CONFIG/nc-nextcloud.sh +++ b/bin/ncp/CONFIG/nc-nextcloud.sh @@ -175,9 +175,9 @@ EOF ## SET APACHE VHOST echo "Setting up Apache..." - bash /usr/local/etc/nextcloud.conf.sh > /etc/apache2/sites-available/nextcloud.conf || { + bash /usr/local/etc/ncp-templates/nextcloud.conf.sh > /etc/apache2/sites-available/nextcloud.conf || { echo "ERROR: An error occured while generating the nextcloud apache2 config. Attempting safe mode..." - bash /usr/local/etc/nextcloud.conf.sh --defaults > /etc/apache2/sites-available/nextcloud.conf || { + bash /usr/local/etc/ncp-templates/nextcloud.conf.sh --defaults > /etc/apache2/sites-available/nextcloud.conf || { echo "ERROR: Safe mode templating failed as well. Nextcloud will not work." exit 1 } diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index 9b5df324..c40a4fa9 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -21,8 +21,7 @@ is_active() tmpl_letsencrypt_domain() { ( . /usr/local/etc/library.sh - if is_active - then + if is_active; then find_app_param letsencrypt DOMAIN fi ) -- cgit v1.2.3