mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2025-04-24 03:26:55 +00:00
Change service and package names referring to php 8.0 to php 8.1
This commit is contained in:
downtownallday
parent
2c6474385e
commit
72827f365d
@ -7,6 +7,6 @@
|
||||
## your own --- please do not ask for help from us.
|
||||
|
||||
upstream php-fpm {
|
||||
server unix:/var/run/php/php8.0-fpm.sock;
|
||||
server unix:/var/run/php/php8.1-fpm.sock;
|
||||
}
|
||||
|
||||
|
||||
@ -248,7 +248,7 @@ def perform_backup(full_backup):
|
||||
if quit:
|
||||
sys.exit(code)
|
||||
|
||||
service_command("php8.0-fpm", "stop", quit=True)
|
||||
service_command("php8.1-fpm", "stop", quit=True)
|
||||
service_command("postfix", "stop", quit=True)
|
||||
service_command("dovecot", "stop", quit=True)
|
||||
service_command("slapd", "stop", quit=True)
|
||||
@ -286,7 +286,7 @@ def perform_backup(full_backup):
|
||||
service_command("slapd", "start", quit=False)
|
||||
service_command("dovecot", "start", quit=False)
|
||||
service_command("postfix", "start", quit=False)
|
||||
service_command("php8.0-fpm", "start", quit=False)
|
||||
service_command("php8.1-fpm", "start", quit=False)
|
||||
|
||||
# Remove old backups. This deletes all backup data no longer needed
|
||||
# from more than 3 days ago.
|
||||
|
||||
@ -1,7 +1,13 @@
|
||||
#!/bin/bash
|
||||
# Nextcloud
|
||||
##########################
|
||||
[ "${FEATURE_NEXTCLOUD:-true}" == "false" ] && return 0
|
||||
if [ "${FEATURE_NEXTCLOUD:-true}" == "false" ]; then
|
||||
source /etc/mailinabox.conf # load global vars
|
||||
# ensure this log file exists or fail2ban won't start
|
||||
mkdir -p $STORAGE_ROOT/owncloud
|
||||
touch $STORAGE_ROOT/owncloud/nextcloud.log
|
||||
return 0
|
||||
fi
|
||||
|
||||
source setup/functions.sh # load our functions
|
||||
source setup/functions-downloads.sh
|
||||
@ -156,7 +162,7 @@ fi
|
||||
if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextcloud_ver ]]; then
|
||||
|
||||
# Stop php-fpm if running. If they are not running (which happens on a previously failed install), dont bail.
|
||||
service php8.0-fpm stop &> /dev/null || /bin/true
|
||||
service php8.1-fpm stop &> /dev/null || /bin/true
|
||||
|
||||
# Backup the existing ownCloud/Nextcloud.
|
||||
# Create a backup directory to store the current installation and database to
|
||||
@ -330,7 +336,7 @@ sudo -u www-data \
|
||||
|
||||
# Set PHP FPM values to support large file uploads
|
||||
# (semicolon is the comment character in this file, hashes produce deprecation warnings)
|
||||
tools/editconf.py /etc/php/8.0/fpm/php.ini -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/php.ini -c ';' \
|
||||
upload_max_filesize=16G \
|
||||
post_max_size=16G \
|
||||
output_buffering=16384 \
|
||||
@ -339,7 +345,7 @@ tools/editconf.py /etc/php/8.0/fpm/php.ini -c ';' \
|
||||
short_open_tag=On
|
||||
|
||||
# Set Nextcloud recommended opcache settings
|
||||
tools/editconf.py /etc/php/8.0/cli/conf.d/10-opcache.ini -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/cli/conf.d/10-opcache.ini -c ';' \
|
||||
opcache.enable=1 \
|
||||
opcache.enable_cli=1 \
|
||||
opcache.interned_strings_buffer=8 \
|
||||
@ -349,8 +355,8 @@ tools/editconf.py /etc/php/8.0/cli/conf.d/10-opcache.ini -c ';' \
|
||||
opcache.revalidate_freq=1
|
||||
|
||||
# If apc is explicitly disabled we need to enable it
|
||||
if grep -q apc.enabled=0 /etc/php/8.0/mods-available/apcu.ini; then
|
||||
tools/editconf.py /etc/php/8.0/mods-available/apcu.ini -c ';' \
|
||||
if grep -q apc.enabled=0 /etc/php/8.1/mods-available/apcu.ini; then
|
||||
tools/editconf.py /etc/php/8.1/mods-available/apcu.ini -c ';' \
|
||||
apc.enabled=1
|
||||
fi
|
||||
|
||||
@ -375,4 +381,4 @@ rm -f /etc/cron.hourly/mailinabox-owncloud
|
||||
# ```
|
||||
|
||||
# Enable PHP modules and restart PHP.
|
||||
restart_service php8.0-fpm
|
||||
restart_service php8.1-fpm
|
||||
|
||||
16
setup/web.sh
16
setup/web.sh
@ -46,15 +46,15 @@ tools/editconf.py /etc/nginx/nginx.conf -s \
|
||||
ssl_protocols="TLSv1.2 TLSv1.3;"
|
||||
|
||||
# Tell PHP not to expose its version number in the X-Powered-By header.
|
||||
tools/editconf.py /etc/php/8.0/fpm/php.ini -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/php.ini -c ';' \
|
||||
expose_php=Off
|
||||
|
||||
# Set PHPs default charset to UTF-8, since we use it. See #367.
|
||||
tools/editconf.py /etc/php/8.0/fpm/php.ini -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/php.ini -c ';' \
|
||||
default_charset="UTF-8"
|
||||
|
||||
# Configure the path environment for php-fpm
|
||||
tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/pool.d/www.conf -c ';' \
|
||||
env[PATH]=/usr/local/bin:/usr/bin:/bin \
|
||||
|
||||
# Configure php-fpm based on the amount of memory the machine has
|
||||
@ -64,7 +64,7 @@ tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}' || /bin/true)
|
||||
if [ $TOTAL_PHYSICAL_MEM -lt 1000000 ]
|
||||
then
|
||||
tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/pool.d/www.conf -c ';' \
|
||||
pm=ondemand \
|
||||
pm.max_children=8 \
|
||||
pm.start_servers=2 \
|
||||
@ -72,7 +72,7 @@ then
|
||||
pm.max_spare_servers=3
|
||||
elif [ $TOTAL_PHYSICAL_MEM -lt 2000000 ]
|
||||
then
|
||||
tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/pool.d/www.conf -c ';' \
|
||||
pm=ondemand \
|
||||
pm.max_children=16 \
|
||||
pm.start_servers=4 \
|
||||
@ -80,14 +80,14 @@ then
|
||||
pm.max_spare_servers=6
|
||||
elif [ $TOTAL_PHYSICAL_MEM -lt 3000000 ]
|
||||
then
|
||||
tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/pool.d/www.conf -c ';' \
|
||||
pm=dynamic \
|
||||
pm.max_children=60 \
|
||||
pm.start_servers=6 \
|
||||
pm.min_spare_servers=3 \
|
||||
pm.max_spare_servers=9
|
||||
else
|
||||
tools/editconf.py /etc/php/8.0/fpm/pool.d/www.conf -c ';' \
|
||||
tools/editconf.py /etc/php/8.1/fpm/pool.d/www.conf -c ';' \
|
||||
pm=dynamic \
|
||||
pm.max_children=120 \
|
||||
pm.start_servers=12 \
|
||||
@ -147,7 +147,7 @@ chown -R $STORAGE_USER $STORAGE_ROOT/www
|
||||
|
||||
# Start services.
|
||||
restart_service nginx
|
||||
restart_service php8.0-fpm
|
||||
restart_service php8.1-fpm
|
||||
|
||||
# Open ports.
|
||||
ufw_allow http
|
||||
|
||||
@ -237,4 +237,4 @@ chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
|
||||
|
||||
# Enable PHP modules.
|
||||
phpenmod -v php mcrypt imap ldap
|
||||
restart_service php8.0-fpm
|
||||
restart_service php8.1-fpm
|
||||
|
||||
@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars
|
||||
|
||||
echo "Installing Z-Push (Exchange/ActiveSync server)..."
|
||||
apt_install \
|
||||
php-soap php-imap libawl-php php8.0-xml
|
||||
php-soap php-imap libawl-php php8.1-xml
|
||||
|
||||
phpenmod -v php imap
|
||||
|
||||
@ -102,7 +102,7 @@ EOF
|
||||
|
||||
# Restart service.
|
||||
|
||||
restart_service php8.0-fpm
|
||||
restart_service php8.1-fpm
|
||||
|
||||
# Fix states after upgrade
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user