diff --git a/freebsd/resources/environment.sh b/freebsd/resources/environment.sh index 5ec856b..5c4b6fc 100755 --- a/freebsd/resources/environment.sh +++ b/freebsd/resources/environment.sh @@ -66,7 +66,7 @@ elif [ .$cpu_architecture = .'x86' ]; then fi switch_source=true switch_package=false - elif [ .$os_mode = .'64' ]; then +q elif [ .$os_mode = .'64' ]; then verbose "Correct CPU and Operating System detected" else error "Unknown Operating System mode $os_mode is unsupported" diff --git a/freebsd/resources/nginx.sh b/freebsd/resources/nginx.sh index df6d9a5..f739104 100755 --- a/freebsd/resources/nginx.sh +++ b/freebsd/resources/nginx.sh @@ -28,6 +28,9 @@ if [ ."$php_version" = ."7" ]; then fi #enable fusionpbx nginx config +mv /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf-orig +cp nginx/nginx.conf /usr/local/etc/nginx +mkdir -p /usr/local/etc/nginx/conf.d cp nginx/fusionpbx.conf /usr/local/etc/nginx/conf.d/fusionpbx #self signed certificate diff --git a/freebsd/resources/nginx/fusionpbx.conf b/freebsd/resources/nginx/fusionpbx.conf index 32742d6..e8bba7a 100644 --- a/freebsd/resources/nginx/fusionpbx.conf +++ b/freebsd/resources/nginx/fusionpbx.conf @@ -1,3 +1,4 @@ + server { listen 127.0.0.1:80; server_name 127.0.0.1; diff --git a/freebsd/resources/nginx/nginx.conf b/freebsd/resources/nginx/nginx.conf new file mode 100644 index 0000000..b312398 --- /dev/null +++ b/freebsd/resources/nginx/nginx.conf @@ -0,0 +1,15 @@ +#load modules +load_module /usr/local/libexec/nginx/ngx_mail_module.so; +load_module /usr/local/libexec/nginx/ngx_stream_module.so; + +#user nobody; +worker_processes 1; + +#includes +include /usr/local/etc/nginx/conf.d/*.conf; + +#events section +events { + worker_connections 768; + # multi_accept on; +} diff --git a/freebsd/resources/php.sh b/freebsd/resources/php.sh index d0c3d9b..e6a2081 100755 --- a/freebsd/resources/php.sh +++ b/freebsd/resources/php.sh @@ -23,10 +23,4 @@ sed -i' ' -e 's#post_max_size = .*#post_max_size = 80M#g' $php_ini_file sed -i' ' -e 's#upload_max_filesize = .*#upload_max_filesize = 80M#g' $php_ini_file #restart php-fpm -#systemd -if [ ."$php_version" = ."5" ]; then - service php5-fpm restart -fi -if [ ."$php_version" = ."7" ]; then - service php7.0-fpm restart -fi +service php-fpm restart