diff --git a/conf/nginx.conf b/conf/nginx.conf index a8a969d9..a7d741cf 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -15,7 +15,7 @@ location __PATH__ { try_files $uri $uri/ index.php; location ~ [^/]\.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, # use a general fpm pool. diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 38af5827..4a93f0cf 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -33,7 +33,7 @@ group = __USER__ ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; 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. ; Default Value: 511 (-1 on FreeBSD and OpenBSD) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2075af05..3e7f6a7f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="php7.1-mbstring postgresql redis-server" +pkg_dependencies="php7.2-mbstring postgresql redis-server" #================================================= # PERSONAL HELPERS @@ -41,7 +41,7 @@ exec_composer() { shift 2 exec_as "$AS_USER" COMPOSER_HOME="${WORKDIR}/.composer" \ - php7.1 "${WORKDIR}/composer.phar" $@ \ + php7.2 "${WORKDIR}/composer.phar" $@ \ -d "${WORKDIR}" --quiet --no-interaction } @@ -54,7 +54,7 @@ init_composer() { # install composer curl -sS https://getcomposer.org/installer \ | COMPOSER_HOME="${WORKDIR}/.composer" \ - php7.1 -- --quiet --install-dir="$WORKDIR" \ + php7.2 -- --quiet --install-dir="$WORKDIR" \ || ynh_die "Unable to install Composer" diff --git a/scripts/install b/scripts/install index 39944be3..f53c2fd7 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set $app is_public $is_public #================================================= ynh_print_info "Installing dependencies..." -ynh_install_php --phpversion=7.1 +ynh_install_php --phpversion=7.2 ynh_install_app_dependencies $pkg_dependencies @@ -105,7 +105,7 @@ ynh_system_user_create $app #================================================= # Create a dedicated php-fpm config -ynh_add_fpm_config --phpversion=7.1 +ynh_add_fpm_config --phpversion=7.2 #================================================= # INSTALL PHP DEPENDENCIES @@ -145,8 +145,8 @@ ynh_store_file_checksum "$config" # generate key and clear cache ( cd "$final_path" - php7.1 artisan -n key:generate --force - php7.1 artisan config:clear + php7.2 artisan -n key:generate --force + php7.2 artisan config:clear ) #=================================================