YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Upgrade to PHP7.2

Browse source
This commit is contained in:
yalh76 2019-03-28 23:54:21 +01:00
parent 7ce242144a
commit cf6dc34a4f
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/nginx.conf
View file

@ -15,7 +15,7 @@ location __PATH__ {
try_files $uri $uri/ index.php; try_files $uri $uri/ index.php;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php7-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
# If you don't use a dedicated fpm config for your app, # If you don't use a dedicated fpm config for your app,
# use a general fpm pool. # use a general fpm pool.

2
conf/php-fpm.conf
View file

@ -33,7 +33,7 @@ group = __USER__
; (IPv6 and IPv4-mapped) on a specific port; ; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket. ; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory. ; Note: This value is mandatory.
listen = /var/run/php7-fpm-__NAMETOCHANGE__.sock listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
; Set listen(2) backlog. ; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD) ; Default Value: 511 (-1 on FreeBSD and OpenBSD)

6
scripts/_common.sh
View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
pkg_dependencies="php7.1-mbstring postgresql redis-server" pkg_dependencies="php7.2-mbstring postgresql redis-server"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS
@ -41,7 +41,7 @@ exec_composer() {
shift 2 shift 2
exec_as "$AS_USER" COMPOSER_HOME="${WORKDIR}/.composer" \ exec_as "$AS_USER" COMPOSER_HOME="${WORKDIR}/.composer" \
php7.1 "${WORKDIR}/composer.phar" $@ \ php7.2 "${WORKDIR}/composer.phar" $@ \
-d "${WORKDIR}" --quiet --no-interaction -d "${WORKDIR}" --quiet --no-interaction
} }
@ -54,7 +54,7 @@ init_composer() {
# install composer # install composer
curl -sS https://getcomposer.org/installer \ curl -sS https://getcomposer.org/installer \
| COMPOSER_HOME="${WORKDIR}/.composer" \ | COMPOSER_HOME="${WORKDIR}/.composer" \
php7.1 -- --quiet --install-dir="$WORKDIR" \ php7.2 -- --quiet --install-dir="$WORKDIR" \
|| ynh_die "Unable to install Composer" || ynh_die "Unable to install Composer"

8
scripts/install
View file

@ -55,7 +55,7 @@ ynh_app_setting_set $app is_public $is_public
#================================================= #=================================================
ynh_print_info "Installing dependencies..." ynh_print_info "Installing dependencies..."
ynh_install_php --phpversion=7.1 ynh_install_php --phpversion=7.2
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
@ -105,7 +105,7 @@ ynh_system_user_create $app
#================================================= #=================================================
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion=7.1 ynh_add_fpm_config --phpversion=7.2
#================================================= #=================================================
# INSTALL PHP DEPENDENCIES # INSTALL PHP DEPENDENCIES
@ -145,8 +145,8 @@ ynh_store_file_checksum "$config"
# generate key and clear cache # generate key and clear cache
( (
cd "$final_path" cd "$final_path"
php7.1 artisan -n key:generate --force php7.2 artisan -n key:generate --force
php7.1 artisan config:clear php7.2 artisan config:clear
) )
#================================================= #=================================================