diff --git a/scripts/blackfire.sh b/scripts/blackfire.sh index 044680e..198edc5 100755 --- a/scripts/blackfire.sh +++ b/scripts/blackfire.sh @@ -23,5 +23,5 @@ echo "$agent" > "/etc/blackfire/agent" echo "$client" > "/home/vagrant/.blackfire.ini" service hhvm restart -service php7.0-fpm restart +service php7.1-fpm restart service blackfire-agent restart diff --git a/scripts/clear-variables.sh b/scripts/clear-variables.sh index 05d9d56..c137d1c 100644 --- a/scripts/clear-variables.sh +++ b/scripts/clear-variables.sh @@ -1,4 +1,4 @@ # Clear The Old Environment Variables sed -i '/# Set Homestead Environment Variable/,+1d' /home/vagrant/.profile -sed -i '/env\[.*/,+1d' /etc/php/7.0/fpm/php-fpm.conf +sed -i '/env\[.*/,+1d' /etc/php/7.1/fpm/php-fpm.conf diff --git a/scripts/homestead.rb b/scripts/homestead.rb index 7d704b8..55fc9ae 100644 --- a/scripts/homestead.rb +++ b/scripts/homestead.rb @@ -238,7 +238,7 @@ def Homestead.configure(config, settings) if settings.has_key?("variables") settings["variables"].each do |var| config.vm.provision "shell" do |s| - s.inline = "echo \"\nenv[$1] = '$2'\" >> /etc/php/7.0/fpm/php-fpm.conf" + s.inline = "echo \"\nenv[$1] = '$2'\" >> /etc/php/7.1/fpm/php-fpm.conf" s.args = [var["key"], var["value"]] end @@ -249,7 +249,7 @@ def Homestead.configure(config, settings) end config.vm.provision "shell" do |s| - s.inline = "service php7.0-fpm restart" + s.inline = "service php7.1-fpm restart" end end diff --git a/scripts/install-oci8.sh b/scripts/install-oci8.sh index 88cce7d..a3412b0 100644 --- a/scripts/install-oci8.sh +++ b/scripts/install-oci8.sh @@ -2,16 +2,17 @@ if php -m | grep oci8; then echo 'oracle extension already installed!' else echo autodetect | pecl install oci8 - echo 'extension=oci8.so' > /etc/php/mods-available/oci8.ini - sudo phpenmod -v 7.0 oci8 - sudo service php7.0-fpm restart + echo 'extension=oci8.so' > /etc/php/7.1/mods-available/oci8.ini + # echo 'extension=oci8.so' > /etc/php/7.1/cli/php.ini + sudo phpenmod -v 7.1 oci8 + sudo service php7.1-fpm restart fi -if cat /etc/php/7.0/fpm/php-fpm.conf | grep ORACLE_HOME; then +if cat /etc/php/7.1/fpm/php-fpm.conf | grep ORACLE_HOME; then echo 'php-fpm oracle env path already set!' else - echo "env[ORACLE_HOME] = '/u01/app/oracle/product/11.2.0/xe'" >> /etc/php/7.0/fpm/php-fpm.conf - echo "env[LD_LIBRARY_PATH] = '/u01/app/oracle/product/11.2.0/xe/lib'" >> /etc/php/7.0/fpm/php-fpm.conf + echo "env[ORACLE_HOME] = '/u01/app/oracle/product/11.2.0/xe'" >> /etc/php/7.1/fpm/php-fpm.conf + echo "env[LD_LIBRARY_PATH] = '/u01/app/oracle/product/11.2.0/xe/lib'" >> /etc/php/7.1/fpm/php-fpm.conf fi if cat /home/vagrant/.bashrc | grep ORACLE_HOME; then diff --git a/scripts/serve-hhvm.sh b/scripts/serve-hhvm.sh index 3145a68..2900a75 100644 --- a/scripts/serve-hhvm.sh +++ b/scripts/serve-hhvm.sh @@ -56,5 +56,5 @@ block="server { echo "$block" > "/etc/nginx/sites-available/$1" ln -fs "/etc/nginx/sites-available/$1" "/etc/nginx/sites-enabled/$1" service nginx restart -service php7.0-fpm restart +service php7.1-fpm restart service hhvm restart diff --git a/scripts/serve-laravel.sh b/scripts/serve-laravel.sh index 539bc63..a4ceb9d 100644 --- a/scripts/serve-laravel.sh +++ b/scripts/serve-laravel.sh @@ -40,7 +40,7 @@ block="server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.1-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; @@ -65,4 +65,4 @@ block="server { echo "$block" > "/etc/nginx/sites-available/$1" ln -fs "/etc/nginx/sites-available/$1" "/etc/nginx/sites-enabled/$1" service nginx restart -service php7.0-fpm restart +service php7.1-fpm restart diff --git a/scripts/serve-symfony2.sh b/scripts/serve-symfony2.sh index 5d730ee..6d6ea63 100644 --- a/scripts/serve-symfony2.sh +++ b/scripts/serve-symfony2.sh @@ -32,7 +32,7 @@ block="server { # DEV location ~ ^/(app_dev|app_test|config)\.php(/|\$) { fastcgi_split_path_info ^(.+\.php)(/.+)\$; - fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.1-fpm.sock; include fastcgi_params; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; @@ -44,7 +44,7 @@ block="server { # PROD location ~ ^/app\.php(/|$) { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.1-fpm.sock; include fastcgi_params; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; @@ -66,4 +66,4 @@ block="server { echo "$block" > "/etc/nginx/sites-available/$1" ln -fs "/etc/nginx/sites-available/$1" "/etc/nginx/sites-enabled/$1" service nginx restart -service php7.0-fpm restart +service php7.1-fpm restart