Skip to content

Commit cfb9251

Browse files
committed
fix: Update script after latest ubuntu changes
* Switch to PHP v8.1 (from v7.4)
1 parent eb97ced commit cfb9251

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

baseline/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ patch -p1 < /time-logging-feature.patch
3232
rm /time-logging-feature.patch
3333
cd /srv/phabricator/phabricator
3434
../arcanist/bin/arc liberate -- src/
35-
/etc/init.d/php7.4-fpm restart
35+
/etc/init.d/php8.1-fpm restart
3636

3737
# Install requirements
3838
DEBIAN_FRONTEND=noninteractive apt update

preflight/10-boot-conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ sed -i "s/PHABRICATOR_DAEMON_USER/$PHABRICATOR_DAEMON_USER/g" /etc/group
198198
sed -i "s/PHABRICATOR_VCS_USER/$PHABRICATOR_VCS_USER/g" /etc/group
199199
sed "s/__PHABRICATOR_VCS_USER__/$PHABRICATOR_VCS_USER/g" /etc/phabricator-ssh/sshd_config.phabricator.template > /etc/phabricator-ssh/sshd_config.phabricator
200200
sed "s/__PHABRICATOR_VCS_USER__/$PHABRICATOR_VCS_USER/g" /etc/phabricator-ssh/phabricator-ssh-hook.sh.template > /etc/phabricator-ssh/phabricator-ssh-hook.sh
201-
sed "s/__PHABRICATOR_WWW_USER__/nginx/g" /etc/php/7.4/fpm/php-fpm.conf.template > /etc/php/7.4/fpm/php-fpm.conf
201+
sed "s/__PHABRICATOR_WWW_USER__/nginx/g" /etc/php/8.1/fpm/php-fpm.conf.template > /etc/php/8.1/fpm/php-fpm.conf
202202

203203
# Update supervisord so that it use rights users for services
204204
sed -i "s/__PHABRICATOR_WWW_USER__/nginx/g" /app/supervisord.conf
@@ -364,7 +364,7 @@ unset APHLICT_PORT
364364
popd
365365

366366
if [ "$ENABLE_APCU" != "" ]; then
367-
cat >/etc/php/7.4/conf.d/apcu.ini <<EOF
367+
cat >/etc/php/8.1/conf.d/apcu.ini <<EOF
368368
extension=apcu.so
369369
EOF
370370
fi

preflight/php.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ magic_quotes_sybase = Off
4343
auto_prepend_file =
4444
auto_append_file =
4545
default_mimetype = "text/html"
46-
include_path = ".:/usr/share/php7.4/:/usr/share/php/7.4/PEAR:/srv/phabricator/PHPExcel/Classes"
46+
include_path = ".:/usr/share/php8.1/:/usr/share/php/8.1/PEAR:/srv/phabricator/PHPExcel/Classes"
4747
doc_root =
4848
user_dir =
4949
enable_dl = Off

preflight/setup.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ mv letsencrypt.sh /app/letsencrypt.sh
2626
mv 10-boot-conf /app/startup/10-boot-conf
2727
mv 15-https-conf /app/startup/15-https-conf
2828

29-
mv php-fpm.conf /etc/php/7.4/fpm/php-fpm.conf.template
30-
mv php.ini /etc/php/7.4/fpm/php.ini
29+
mv php-fpm.conf /etc/php/8.1/fpm/php-fpm.conf.template
30+
mv php.ini /etc/php/8.1/fpm/php.ini
3131

3232
mv supervisord.conf /app/supervisord.conf
3333
mv init.sh /app/init.sh
@@ -45,8 +45,8 @@ ls /preflight
4545
rmdir /preflight # This should now be empty; it's an error if it's not.
4646

4747
# Install PHPExcel
48-
echo '' >> /etc/php/7.4/fpm/php-fpm.conf
49-
echo 'php_value[include_path] = "/srv/phabricator/PHPExcel/Classes"' >> /etc/php/7.4/fpm/php-fpm.conf
48+
echo '' >> /etc/php/8.1/fpm/php-fpm.conf
49+
echo 'php_value[include_path] = "/srv/phabricator/PHPExcel/Classes"' >> /etc/php/8.1/fpm/php-fpm.conf
5050

5151
# Move the default SSH to port 24
5252
mkdir -p /etc/ssh/sshd_config.d/

preflight/supervisord.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
nodaemon=true
33

44
[program:php-fpm]
5-
command=/usr/sbin/php-fpm7.4
5+
command=/usr/sbin/php-fpm8.1
66
autorestart=true
77
stdout_logfile=/dev/fd/1
88
stdout_logfile_maxbytes=0

0 commit comments

Comments
 (0)