mirror of
https://github.com/nextcloud/docker.git
synced 2024-12-25 10:36:14 +01:00
Un-factor do_install_or_upgrade()
Signed-off-by: Remi Rampin <remi@rampin.org>
This commit is contained in:
Remi Rampin
parent
8aabc4b3ea
commit
405e815285
1 changed files with 119 additions and 122 deletions
|
|
@ -43,7 +43,71 @@ file_env() {
|
||||||
unset "$fileVar"
|
unset "$fileVar"
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_or_upgrade() {
|
if expr "$1" : "apache" 1>/dev/null; then
|
||||||
|
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
|
||||||
|
a2disconf remoteip
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
|
||||||
|
uid="$(id -u)"
|
||||||
|
gid="$(id -g)"
|
||||||
|
if [ "$uid" = '0' ]; then
|
||||||
|
case "$1" in
|
||||||
|
apache2*)
|
||||||
|
user="${APACHE_RUN_USER:-www-data}"
|
||||||
|
group="${APACHE_RUN_GROUP:-www-data}"
|
||||||
|
|
||||||
|
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
|
||||||
|
user="${user#'#'}"
|
||||||
|
group="${group#'#'}"
|
||||||
|
;;
|
||||||
|
*) # php-fpm
|
||||||
|
user='www-data'
|
||||||
|
group='www-data'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
user="$uid"
|
||||||
|
group="$gid"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "${REDIS_HOST+x}" ]; then
|
||||||
|
|
||||||
|
echo "Configuring Redis as session handler"
|
||||||
|
{
|
||||||
|
file_env REDIS_HOST_PASSWORD
|
||||||
|
echo 'session.save_handler = redis'
|
||||||
|
# check if redis host is an unix socket path
|
||||||
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
|
fi
|
||||||
|
# check if redis password has been set
|
||||||
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
|
fi
|
||||||
|
echo "redis.session.locking_enabled = 1"
|
||||||
|
echo "redis.session.lock_retries = -1"
|
||||||
|
# redis.session.lock_wait_time is specified in microseconds.
|
||||||
|
# Wait 10ms before retrying the lock rather than the default 2ms.
|
||||||
|
echo "redis.session.lock_wait_time = 10000"
|
||||||
|
} > /usr/local/etc/php/conf.d/redis-session.ini
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If another process is syncing the html folder, wait for
|
||||||
|
# it to be done, then escape initalization.
|
||||||
|
(
|
||||||
|
if ! flock -n 9; then
|
||||||
|
# If we couldn't get it immediately, show a message, then wait for real
|
||||||
|
echo "Another process is initializing Nextcloud. Waiting..."
|
||||||
|
flock 9
|
||||||
|
fi
|
||||||
|
|
||||||
installed_version="0.0.0.0"
|
installed_version="0.0.0.0"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
|
|
@ -162,73 +226,6 @@ do_install_or_upgrade() {
|
||||||
if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
|
if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
run_as 'php /var/www/html/occ maintenance:update:htaccess'
|
run_as 'php /var/www/html/occ maintenance:update:htaccess'
|
||||||
fi
|
fi
|
||||||
}
|
|
||||||
|
|
||||||
if expr "$1" : "apache" 1>/dev/null; then
|
|
||||||
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
|
|
||||||
a2disconf remoteip
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
|
|
||||||
uid="$(id -u)"
|
|
||||||
gid="$(id -g)"
|
|
||||||
if [ "$uid" = '0' ]; then
|
|
||||||
case "$1" in
|
|
||||||
apache2*)
|
|
||||||
user="${APACHE_RUN_USER:-www-data}"
|
|
||||||
group="${APACHE_RUN_GROUP:-www-data}"
|
|
||||||
|
|
||||||
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
|
|
||||||
user="${user#'#'}"
|
|
||||||
group="${group#'#'}"
|
|
||||||
;;
|
|
||||||
*) # php-fpm
|
|
||||||
user='www-data'
|
|
||||||
group='www-data'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
user="$uid"
|
|
||||||
group="$gid"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "${REDIS_HOST+x}" ]; then
|
|
||||||
|
|
||||||
echo "Configuring Redis as session handler"
|
|
||||||
{
|
|
||||||
file_env REDIS_HOST_PASSWORD
|
|
||||||
echo 'session.save_handler = redis'
|
|
||||||
# check if redis host is an unix socket path
|
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
|
||||||
fi
|
|
||||||
# check if redis password has been set
|
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
|
||||||
fi
|
|
||||||
echo "redis.session.locking_enabled = 1"
|
|
||||||
echo "redis.session.lock_retries = -1"
|
|
||||||
# redis.session.lock_wait_time is specified in microseconds.
|
|
||||||
# Wait 10ms before retrying the lock rather than the default 2ms.
|
|
||||||
echo "redis.session.lock_wait_time = 10000"
|
|
||||||
} > /usr/local/etc/php/conf.d/redis-session.ini
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If another process is syncing the html folder, wait for
|
|
||||||
# it to be done, then escape initalization.
|
|
||||||
(
|
|
||||||
if ! flock -n 9; then
|
|
||||||
# If we couldn't get it immediately, show a message, then wait for real
|
|
||||||
echo "Another process is initializing Nextcloud. Waiting..."
|
|
||||||
flock 9
|
|
||||||
fi
|
|
||||||
do_install_or_upgrade
|
|
||||||
) 9> /var/www/html/nextcloud-init-sync.lock
|
) 9> /var/www/html/nextcloud-init-sync.lock
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue