External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

nc-limits.sh: Migrate installation of www.conf to ncp template

Browse Source 
Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
thecalcaholic 2022-09-16 00:16:25 +02:00
parent 4737b56d71
commit 7225c2c898
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/ncp/CONFIG/nc-limits.sh
View File

@ -33,6 +33,13 @@ tmpl_php_max_filesize() {
[[ "$FILESIZE" == "0" ]] && echo -n "10G" || echo -n "$FILESIZE"
}
tmpl_php_threads() {
local PHPTHREADS="$(find_app_param nc-limits PHPTHREADS)"
[[ $PHPTHREADS -eq 0 ]] && PHPTHREADS=$(nproc)
[[ $PHPTHREADS -lt 6 ]] && PHPTHREADS=6
echo -n "$PHPTHREADS"
}
configure()
{
# Set auto memory limit to 75% of the total memory
@ -53,13 +60,10 @@ configure()
# MAX PHP THREADS
local CONF=/etc/php/${PHPVER}/fpm/pool.d/www.conf
local CURRENT_THREADS="$( grep "^pm.max_children" "$CONF" 2>/dev/null | awk '{ print $3 }' || true )"
[[ $PHPTHREADS -eq 0 ]] && PHPTHREADS=$(nproc)
[[ $PHPTHREADS -lt 6 ]] && PHPTHREADS=6
echo "Using $PHPTHREADS PHP threads"
sed -i "s|^pm =.*|pm = static|" "$CONF"
sed -i "s|^pm.max_children =.*|pm.max_children = $PHPTHREADS|" "$CONF"
[[ "$PHPTHREADS" == "$CURRENT_THREADS" ]] || require_fpm_restart=true
CONF_VALUE="$(cat "$CONF" 2> /dev/null || true)"
echo "Using $(tmpl_php_threads) PHP threads"
install_template "php/pool.d.www.conf.sh" "$CONF"
[[ "$CONF_VALUE" == "$(cat "$CONF")" ]] || require_fpm_restart=true
local CONF=/etc/mysql/mariadb.conf.d/91-ncp.cnf
CONF_VALUE="$(cat "$CONF" 2> /dev/null || true)"
@ -71,7 +75,7 @@ configure()
# redis max memory
local CONF=/etc/redis/redis.conf
local CURRENT_REDIS_MEM=$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )
local CURRENT_REDIS_MEM="$( grep "^maxmemory" "$CONF" | awk '{ print $2 }' )"
[[ "$REDISMEM" != "$CURRENT_REDIS_MEM" ]] && {
sed -i "s|^maxmemory .*|maxmemory $REDISMEM|" "$CONF"
chown redis:redis "$CONF"

32
etc/ncp-templates/php/pool.d.www.conf.sh Normal file
View File

@ -0,0 +1,32 @@
#! /bin/bash
set -e
source /usr/local/etc/library.sh
PHPVER="${PHPVER?ERROR: PHPVER variable unset!}"
if [[ "$1" == "--defaults" ]] || ! [[ -f "${BINDIR}/CONFIG/nc-datadir.sh" ]]
then
echo -e "INFO: Restoring template to default settings"
PHPTHREADS=6
else
PHPTHREADS="$(source "${BINDIR}/CONFIG/nc-limits.sh"; tmpl_php_threads)"
fi
cat <<EOF
[www]
user = www-data
group = www-data
listen = /run/php/php7.4-fpm.sock
listen.owner = www-data
listen.group = www-data
pm = static
pm.max_children = ${PHPTHREADS}
pm.start_servers = 4
pm.min_spare_servers = 4
pm.max_spare_servers = 8
pm.status_path = /status
slowlog = log/\$pool.log.slow
EOF