Skip to content

Commit 31eb351

Browse files
PDowneyPDowney
committed
Major Release
Added and removed a lot of things. Major additions include PHP 8.1, OpenSSL 3.0, and MariaDB 10.7. A bug in WP-CLI was preventing it from working with PHP 8.1. A bug report was submitted to the WP-CLI team and they fixed the issue in recent weeks. EngineScript uses WP-CLI to create new WordPress installations, and this bug was holding up further code releases. It is recommended to test this major release on a fresh server. Many things were changed over the past months and upgrade scripts will likely not be able to account for all changes. Moving forward, upgrade scripts will be better fleshed out and releases should flow better now that the WP-CLI bug with PHP 8.1 has been fixed.
1 parent 26ab966 commit 31eb351

21 files changed

Lines changed: 186 additions & 42 deletions

File tree

‎enginescript-install.sh‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ fi
2424
# We do this in-case the user is a novice and uploaded the options file using a basic Windows text editor.
2525
dos2unix /home/EngineScript/enginescript-install-options.txt
2626

27+
# Permissions
28+
# Just in case you changed any files and changed Permissions
29+
find /usr/local/bin/enginescript -type d,f -exec chmod 755 {} \;
30+
chown -R root:root /usr/local/bin/enginescript
31+
2732
# EngineScript Variables
2833
source /usr/local/bin/enginescript/enginescript-variables.txt
2934
source /home/EngineScript/enginescript-install-options.txt
@@ -128,13 +133,22 @@ if [ "${ACME}" = 1 ];
128133
fi
129134

130135
# GCC
131-
#if [ "${GCC}" = 1 ];
132-
# then
133-
# echo "GCC script has already run."
134-
# else
135-
# /usr/local/bin/enginescript/scripts/install/gcc/gcc-install.sh
136-
# echo "GCC=1" >> /home/EngineScript/install-log.txt
137-
#fi
136+
if [ "${GCC}" = 1 ];
137+
then
138+
echo "GCC script has already run."
139+
else
140+
/usr/local/bin/enginescript/scripts/install/gcc/gcc-install.sh
141+
echo "GCC=1" >> /home/EngineScript/install-log.txt
142+
fi
143+
144+
# OpenSSL
145+
if [ "${OPENSSL}" = 1 ];
146+
then
147+
echo "OPENSSL script has already run."
148+
else
149+
/usr/local/bin/enginescript/scripts/install/openssl/openssl-install.sh
150+
echo "OPENSSL=1" >> /home/EngineScript/install-log.txt
151+
fi
138152

139153
# Jemalloc
140154
if [ "${JEMALLOC}" = 1 ];
@@ -262,6 +276,15 @@ if [ "${CRON}" = 1 ];
262276
echo "CRON=1" >> /home/EngineScript/install-log.txt
263277
fi
264278

279+
# MariaDB
280+
if [ "${MARIADB}" = 1 ];
281+
then
282+
echo "MARIADB script has already run."
283+
else
284+
/usr/local/bin/enginescript/scripts/install/mariadb/mariadb-install.sh
285+
echo "MARIADB=1" >> /home/EngineScript/install-log.txt
286+
fi
287+
265288
# PHP
266289
if [ "${PHP}" = 1 ];
267290
then
@@ -289,15 +312,6 @@ if [ "${NGINX}" = 1 ];
289312
echo "NGINX=1" >> /home/EngineScript/install-log.txt
290313
fi
291314

292-
# MariaDB
293-
if [ "${MARIADB}" = 1 ];
294-
then
295-
echo "MARIADB script has already run."
296-
else
297-
/usr/local/bin/enginescript/scripts/install/mariadb/mariadb-install.sh
298-
echo "MARIADB=1" >> /home/EngineScript/install-log.txt
299-
fi
300-
301315
# Tools
302316
if [ "${TOOLS}" = 1 ];
303317
then

‎enginescript-variables.txt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@
77
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
88

99
# EngineScript Version
10-
VARIABLES_DATE="DECEMBER 06 2021"
10+
VARIABLES_DATE="MARCH 04 2022"
1111

1212
# Software Versions
13-
MARIADB_VER="10.6"
13+
MARIADB_VER="10.7"
1414
NGINX_HEADER_VER="0.33"
1515
NGINX_PURGE_VER="2.5.1"
16-
NGINX_VER="1.21.4"
17-
OPENSSL_VER="1.1.1l"
18-
PCRE_VER="8.45"
19-
PHP_VER="8.0"
20-
PHPMYADMIN_VER="5.1.1"
16+
NGINX_VER="1.21.6"
17+
OPENSSL_VER="3.0.1"
18+
PCRE2_VER="10.39"
19+
PHP_VER="8.1"
20+
PHPMYADMIN_VER="5.1.3"
2121
ZLIB_VER="1.2.11"
2222

2323
# Old Software Versions
2424
OLDPHP="8.0"
25+
PCRE_VER="8.45"
2526

2627
# EngineScript Variables
2728
BIT_TYPE="$(uname -m)"

etc/logrotate.d/php8.0-fpm renamed to etc/logrotate.d/php8.1-fpm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
compress
77
delaycompress
88
postrotate
9-
if [ -x /usr/lib/php/php8.0-fpm-reopenlogs ]; then
10-
/usr/lib/php/php8.0-fpm-reopenlogs;
9+
if [ -x /usr/lib/php/php8.1-fpm-reopenlogs ]; then
10+
/usr/lib/php/php8.1-fpm-reopenlogs;
1111
fi
1212
endscript
1313
}

‎etc/nginx/globals/php.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ include /etc/nginx/fastcgi.conf;
2828
fastcgi_param HTTP_PROXY "";
2929

3030
fastcgi_cache EngineScriptWP;
31-
fastcgi_pass unix:/run/php/php8.0-fpm.sock;
31+
fastcgi_pass unix:/run/php/php8.1-fpm.sock;

‎etc/php/php-fpm.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
;;;;;;;;;;;;;;;;;;
88

99
[global]
10-
pid = /run/php/php8.0-fpm.pid
11-
error_log = /var/log/php8.0-fpm.log
10+
pid = /run/php/php8.1-fpm.pid
11+
error_log = /var/log/php8.1-fpm.log
1212
;syslog.facility = daemon
1313
;syslog.ident = php-fpm
1414
;log_level = notice
@@ -28,4 +28,4 @@ process_control_timeout = 10s
2828
;;;;;;;;;;;;;;;;;;;;
2929
; Pool Definitions ;
3030
;;;;;;;;;;;;;;;;;;;;
31-
include=/etc/php/8.0/fpm/pool.d/*.conf
31+
include=/etc/php/8.1/fpm/pool.d/*.conf

‎etc/php/www.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
;prefix = /path/to/pools/$pool
33
user = www-data
44
group = www-data
5-
listen = /run/php/php8.0-fpm.sock
5+
listen = /run/php/php8.1-fpm.sock
66
;listen.backlog = 511
77
listen.owner = www-data
88
listen.group = www-data

‎scripts/cron/permissions.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ chmod 775 /var/cache/nginx
5151
find /var/log/php -type d,f -exec chmod 755 {} \;
5252
find /var/log/opcache -type d,f -exec chmod 755 {} \;
5353
find /etc/php -type d,f -exec chmod 755 {} \;
54-
chmod 775 /var/cache/opcache
54+
chmod 775 /var/cache/.opcache
5555

56-
chown -R www-data:www-data /var/cache/opcache
56+
chown -R www-data:www-data /var/cache/.opcache
5757
chown -R www-data:www-data /var/log/opcache
5858
chown -R www-data:www-data /var/log/php
5959
chown -R www-data:www-data /etc/php

‎scripts/functions/enginescript-cleanup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
# Cleanup
2828

2929
# Remove Apache and old PHP installations
30-
apt-get remove 'apache2.*' 'php7\.0.*' 'php7\.1.*' 'php7\.2.*' 'php7\.3.*' 'php7\.4.*' -y
30+
apt-get remove 'apache2.*' 'php7\.0.*' 'php7\.1.*' 'php7\.2.*' 'php7\.3.*' 'php7\.4.*' 'php8\.0.*' -y
3131

3232
# Remove old downloads
3333
rm -rf /usr/src/*.tar.gz*

‎scripts/install/block/package-block.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ echo -e "Package: php7.3*\nPin: release *\nPin-Priority: -1" > php73-block
5353

5454
# Block PHP 7.4 from APT
5555
echo -e "Package: php7.4*\nPin: release *\nPin-Priority: -1" > php74-block
56+
57+
# Block PHP 8.0 from APT
58+
echo -e "Package: php8.0*\nPin: release *\nPin-Priority: -1" > php80-block

‎scripts/install/kernel/ksm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ "${EUID}" != 0 ];
1818
fi
1919

2020
# Install
21-
apt-get install ksmtuned --no-install-recommends
21+
apt-get install -qy ksmtuned --no-install-recommends
2222
sudo systemctl enable --now ksm.service
2323
mkdir -p /opt/kernel-samepage-merging/
2424
cp -rf /usr/local/bin/enginescript/etc/systemd/system/ksm.service /etc/systemd/system/ksm.service

0 commit comments

Comments
 (0)