From a6101c8d0c88ce310036c6d9b9801b47226f4289 Mon Sep 17 00:00:00 2001 From: Alan Arguelles Date: Tue, 19 Mar 2019 14:53:24 +0800 Subject: [PATCH 1/5] Changes php version from 7.1 to 7.2 to support the latest laravel versions --- provision.sh | 60 ++++++++++++++++++++++++++-------------------------- serve.sh | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/provision.sh b/provision.sh index 4dd51f6..bd75298 100644 --- a/provision.sh +++ b/provision.sh @@ -42,11 +42,11 @@ usermod -aG www-data homestead ln -sf /usr/share/zoneinfo/UTC /etc/localtime # PHP -apt-get install -y php7.1-cli php7.1-dev \ -php7.1-mysql php7.1-pgsql php7.1-sqlite3 php7.1-soap \ -php7.1-json php7.1-curl php7.1-gd \ -php7.1-gmp php7.1-imap php7.1-mcrypt php-xdebug \ -php7.1-mbstring php7.1-zip \ +apt-get install -y php7.2-cli php7.2-dev \ +php7.2-mysql php7.2-pgsql php7.2-sqlite3 php7.2-soap \ +php7.2-json php7.2-curl php7.2-gd \ +php7.2-gmp php7.2-imap php7.2-mcrypt php-xdebug \ +php7.2-mbstring php7.2-zip \ php-pear php-apcu php-memcached php-redis # Nginx & PHP-FPM @@ -68,26 +68,26 @@ su homestead <<'EOF' EOF # Set Some PHP CLI Settings -sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.1/cli/php.ini -sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.1/cli/php.ini -sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/7.1/cli/php.ini -sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/7.1/cli/php.ini - -sed -i "s/.*daemonize.*/daemonize = no/" /etc/php/7.1/fpm/php-fpm.conf -sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.1/fpm/php.ini -sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.1/fpm/php.ini -sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/7.1/fpm/php.ini -sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/7.1/fpm/php.ini -sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/7.1/fpm/php.ini +sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.2/cli/php.ini +sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.2/cli/php.ini +sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/7.2/cli/php.ini +sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/7.2/cli/php.ini + +sed -i "s/.*daemonize.*/daemonize = no/" /etc/php/7.2/fpm/php-fpm.conf +sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.2/fpm/php.ini +sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.2/fpm/php.ini +sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/7.2/fpm/php.ini +sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/7.2/fpm/php.ini +sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/7.2/fpm/php.ini # Enable Remote xdebug -echo "xdebug.remote_enable = 1" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.remote_connect_back = 1" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.remote_port = 9000" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.var_display_max_depth = -1" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.var_display_max_children = -1" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.var_display_max_data = -1" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini -echo "xdebug.max_nesting_level = 500" >> /etc/php/7.1/fpm/conf.d/20-xdebug.ini +echo "xdebug.remote_enable = 1" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.remote_connect_back = 1" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.remote_port = 9000" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.var_display_max_depth = -1" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.var_display_max_children = -1" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.var_display_max_data = -1" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini +echo "xdebug.max_nesting_level = 500" >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini # Not xdebug when on cli phpdismod -s cli xdebug @@ -98,12 +98,12 @@ sed -i "s/user www-data;/user homestead;/" /etc/nginx/nginx.conf sed -i "s/# server_names_hash_bucket_size.*/server_names_hash_bucket_size 64;/" /etc/nginx/nginx.conf mkdir -p /run/php -touch /run/php/php7.1-fpm.sock -sed -i "s/user = www-data/user = homestead/" /etc/php/7.1/fpm/pool.d/www.conf -sed -i "s/group = www-data/group = homestead/" /etc/php/7.1/fpm/pool.d/www.conf -sed -i "s/;listen\.owner.*/listen.owner = homestead/" /etc/php/7.1/fpm/pool.d/www.conf -sed -i "s/;listen\.group.*/listen.group = homestead/" /etc/php/7.1/fpm/pool.d/www.conf -sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/7.1/fpm/pool.d/www.conf +touch /run/php/php7.2-fpm.sock +sed -i "s/user = www-data/user = homestead/" /etc/php/7.2/fpm/pool.d/www.conf +sed -i "s/group = www-data/group = homestead/" /etc/php/7.2/fpm/pool.d/www.conf +sed -i "s/;listen\.owner.*/listen.owner = homestead/" /etc/php/7.2/fpm/pool.d/www.conf +sed -i "s/;listen\.group.*/listen.group = homestead/" /etc/php/7.2/fpm/pool.d/www.conf +sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/7.2/fpm/pool.d/www.conf # Install Node curl --silent --location https://deb.nodesource.com/setup_8.x | bash - @@ -154,7 +154,7 @@ block="server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php/php7.1-fpm.sock; + fastcgi_pass unix:/run/php/php7.2-fpm.sock; fastcgi_index index.php; include fastcgi.conf; } diff --git a/serve.sh b/serve.sh index 17e4e8f..ca33e60 100644 --- a/serve.sh +++ b/serve.sh @@ -25,7 +25,7 @@ block="server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/php/php7.1-fpm.sock; + fastcgi_pass unix:/run/php/php7.2-fpm.sock; fastcgi_index index.php; # include fastcgi_params; include fastcgi.conf; From c00d60b70c2664f3aa1ba13744cfe938da4303ce Mon Sep 17 00:00:00 2001 From: Alan Arguelles Date: Tue, 19 Mar 2019 15:44:32 +0800 Subject: [PATCH 2/5] Removes mcrypt and updates laravel/envoy to v 1.5.0 --- provision.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/provision.sh b/provision.sh index bd75298..2bf4cc6 100644 --- a/provision.sh +++ b/provision.sh @@ -22,7 +22,7 @@ sed -i "s/PermitRootLogin.*/PermitRootLogin yes/g" /etc/ssh/sshd_config # Basic packages apt-get install -y sudo software-properties-common nano curl \ -build-essential dos2unix gcc git git-flow libmcrypt4 libpcre3-dev apt-utils \ +build-essential dos2unix gcc git git-flow libpcre3-dev apt-utils \ make python2.7-dev python-pip re2c supervisor unattended-upgrades whois vim zip unzip # PPA @@ -45,15 +45,12 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime apt-get install -y php7.2-cli php7.2-dev \ php7.2-mysql php7.2-pgsql php7.2-sqlite3 php7.2-soap \ php7.2-json php7.2-curl php7.2-gd \ -php7.2-gmp php7.2-imap php7.2-mcrypt php-xdebug \ +php7.2-gmp php7.2-imap php-xdebug \ php7.2-mbstring php7.2-zip \ php-pear php-apcu php-memcached php-redis # Nginx & PHP-FPM -apt-get install -y nginx php-fpm - -# Enable mcrypt -phpenmod mcrypt +apt-get install -y nginx php7.2-fpm # Install Composer curl -sS https://getcomposer.org/installer | php @@ -64,7 +61,7 @@ printf "\nPATH=\"/home/homestead/.composer/vendor/bin:\$PATH\"\n" | tee -a /home # Laravel Envoy su homestead <<'EOF' -/usr/local/bin/composer global require "laravel/envoy=~1.0" +/usr/local/bin/composer global require "laravel/envoy=~1.5.0" EOF # Set Some PHP CLI Settings From 5a78743d47ed1e79d6c22f1fc42c6644d26e6e30 Mon Sep 17 00:00:00 2001 From: Alan Arguelles Date: Tue, 19 Mar 2019 16:12:03 +0800 Subject: [PATCH 3/5] Adds php7.2-dom for phpunit and sets php7.2-fpm to autostart via supervisor --- provision.sh | 3 ++- supervisor.conf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/provision.sh b/provision.sh index 2bf4cc6..56358ba 100644 --- a/provision.sh +++ b/provision.sh @@ -47,7 +47,8 @@ php7.2-mysql php7.2-pgsql php7.2-sqlite3 php7.2-soap \ php7.2-json php7.2-curl php7.2-gd \ php7.2-gmp php7.2-imap php-xdebug \ php7.2-mbstring php7.2-zip \ -php-pear php-apcu php-memcached php-redis +php-pear php-apcu php-memcached php-redis \ +php7.2-dom # Nginx & PHP-FPM apt-get install -y nginx php7.2-fpm diff --git a/supervisor.conf b/supervisor.conf index d7dcca6..8dd66be 100644 --- a/supervisor.conf +++ b/supervisor.conf @@ -7,7 +7,7 @@ autostart=true autorestart=true [program:php-fpm7.1] -command=/usr/sbin/php-fpm7.1 +command=/usr/sbin/php-fpm7.2 autostart=true autorestart=true From fbda0faff584662c605c51dbd2ec6fc3c27a7829 Mon Sep 17 00:00:00 2001 From: Alan Arguelles Date: Tue, 19 Mar 2019 16:20:06 +0800 Subject: [PATCH 4/5] Updates missed php packages to 7.2 --- provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision.sh b/provision.sh index 56358ba..aecd8af 100644 --- a/provision.sh +++ b/provision.sh @@ -45,9 +45,9 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime apt-get install -y php7.2-cli php7.2-dev \ php7.2-mysql php7.2-pgsql php7.2-sqlite3 php7.2-soap \ php7.2-json php7.2-curl php7.2-gd \ -php7.2-gmp php7.2-imap php-xdebug \ +php7.2-gmp php7.2-imap php7.2-xdebug \ php7.2-mbstring php7.2-zip \ -php-pear php-apcu php-memcached php-redis \ +php7.2-pear php7.2-apcu php7.2-memcached php7.2-redis \ php7.2-dom # Nginx & PHP-FPM From 28f6b70d95f7aad3528ce7573ee4641bf2e800e0 Mon Sep 17 00:00:00 2001 From: Alan Arguelles Date: Tue, 19 Mar 2019 16:31:59 +0800 Subject: [PATCH 5/5] Removes versions from packages that doesn't require it --- provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision.sh b/provision.sh index aecd8af..56358ba 100644 --- a/provision.sh +++ b/provision.sh @@ -45,9 +45,9 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime apt-get install -y php7.2-cli php7.2-dev \ php7.2-mysql php7.2-pgsql php7.2-sqlite3 php7.2-soap \ php7.2-json php7.2-curl php7.2-gd \ -php7.2-gmp php7.2-imap php7.2-xdebug \ +php7.2-gmp php7.2-imap php-xdebug \ php7.2-mbstring php7.2-zip \ -php7.2-pear php7.2-apcu php7.2-memcached php7.2-redis \ +php-pear php-apcu php-memcached php-redis \ php7.2-dom # Nginx & PHP-FPM