Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to php 7.1 #13

Open
wants to merge 1 commit into
base: php7
Choose a base branch
from
Open

Update to php 7.1 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/blackfire.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/clear-variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions scripts/homestead.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
13 changes: 7 additions & 6 deletions scripts/install-oci8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/serve-hhvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions scripts/serve-laravel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
6 changes: 3 additions & 3 deletions scripts/serve-symfony2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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