From 40e2f4ac510fd1a7254c9eee67870de8a19aad61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Wed, 8 Dec 2021 01:37:42 +0100 Subject: [PATCH] Support setting NEXTCLOUD_AUTH_TOKEN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows to set up the nextcloud auth token during install. Purpose is to make the install smoother by exposing it and have server info and metrics available to verify the status of the install. Signed-off-by: Manuel Rüger --- 22/apache/entrypoint.sh | 5 +++++ 22/fpm-alpine/entrypoint.sh | 5 +++++ 22/fpm/entrypoint.sh | 5 +++++ 23/apache/entrypoint.sh | 5 +++++ 23/fpm-alpine/entrypoint.sh | 5 +++++ 23/fpm/entrypoint.sh | 5 +++++ README.md | 1 + docker-entrypoint.sh | 5 +++++ 8 files changed, 36 insertions(+) diff --git a/22/apache/entrypoint.sh b/22/apache/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/22/apache/entrypoint.sh +++ b/22/apache/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/22/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/22/fpm-alpine/entrypoint.sh +++ b/22/fpm-alpine/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/22/fpm/entrypoint.sh b/22/fpm/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/22/fpm/entrypoint.sh +++ b/22/fpm/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/23/apache/entrypoint.sh +++ b/23/apache/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/23/fpm-alpine/entrypoint.sh +++ b/23/fpm-alpine/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/23/fpm/entrypoint.sh +++ b/23/fpm/entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi diff --git a/README.md b/README.md index bb5b8717..ecd243f9 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ If you set any group of values (i.e. all of `MYSQL_DATABASE`, `MYSQL_USER`, `MYS - `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user. - `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user. +- `NEXTCLOUD_AUTH_TOKEN` Authentication token to access server info. If you want, you can set the data directory, otherwise default value will be used. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 413ae9c6..5d104c0c 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -191,6 +191,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) done fi + file_env NEXTCLOUD_AUTH_TOKEN + if [ -n "${NEXTCLOUD_AUTH_TOKEN+x}" ]; then + echo "setting auth token" + run_as "php /var/www/html/occ config:app:set serverinfo token --value $NEXTCLOUD_AUTH_TOKEN" + fi else echo "Please run the web-based installer on first connect!" fi