From 3643b7ad25167d73f308a8006f50676264570afe Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 24 Jun 2017 11:38:09 -0600 Subject: [PATCH] Update nginx.sh --- freebsd/resources/nginx.sh | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/freebsd/resources/nginx.sh b/freebsd/resources/nginx.sh index 64ebbf3..084b97b 100755 --- a/freebsd/resources/nginx.sh +++ b/freebsd/resources/nginx.sh @@ -7,8 +7,8 @@ cd "$(dirname "$0")" . ./config.sh . ./colors.sh -#set the current working directory -cwd=$(pwd) +#install php +. ./php.sh #send a message verbose "Installing the web server" @@ -18,38 +18,6 @@ pkg install --yes nginx #enable nginx echo 'nginx_enable="YES"' >> /etc/rc.conf -echo 'php_fpm_enable="YES"' >> /etc/rc.conf - -#set the default version of postgres -echo "DEFAULT_VERSIONS+=pgsql=$database_version" >> /etc/make.conf -echo "DEFAULT_VERSIONS+=ssl=openssl" >> /etc/make.conf - -#install dependencies -if [ ."$php_version" = ."5" ]; then - pkg install --yes php56 php56-phar php56-pgsql php56-pdo php56-pdo_pgsql php56-pdo_odbc php56-pdo_sqlite php56-json php56-gd - pkg install --yes php56-imap php56-ldap php56-mcrypt php56-openssl php56-sockets php56-simplexml php56-xml php56-session -fi -if [ ."$php_version" = ."7" ]; then - #pkg install --yes php70 php70-phar php70-pgsql php70-pdo php70-pdo_pgsql php70-pdo_odbc php70-pdo_sqlite php70-json php70-gd - #pkg install --yes php70-imap php70-ldap php70-mcrypt php70-openssl php70-sockets php70-simplexml php70-xml php70-session - pkg install --yes php71 php71-phar php71-pdo php71-pdo_odbc php71-pdo_sqlite php71-json php71-gd php71-imap - pkg install --yes php71-ldap php71-mcrypt php71-openssl php71-sockets php71-simplexml php71-xml php71-session - if [ ."$database_version" = ."9.3" ]; then - pkg install --yes postgresql93-client - pkg install --yes php71-pdo_pgsql php71-pgsql - fi - if [ ."$database_version" = ."9.6" ]; then - pkg install --yes postgresql96-client - pkg add https://www.fusionpbx.com/php71-pdo_pgsql-7.1.6_1.txz - pkg add https://www.fusionpbx.com/php71-pgsql-7.1.6_1.txz - - #cd /usr/ports/databases/php71-pdo_pgsql/ && make install clean BATCH=yes - #cd /usr/ports/databases/php71-pgsql && make install clean BATCH=yes - fi -fi - -#reset the current working directory -cd $cwd #enable fusionpbx nginx config mv /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf-orig