diff --git a/etc/nginx/conf.d/buffers_noPHP.conf b/etc/nginx/conf.d/buffers.conf similarity index 100% rename from etc/nginx/conf.d/buffers_noPHP.conf rename to etc/nginx/conf.d/buffers.conf diff --git a/etc/nginx/conf.d/buffers_conf_php.option b/etc/nginx/conf.d/buffers_conf_php.option new file mode 100644 index 0000000..d208b02 --- /dev/null +++ b/etc/nginx/conf.d/buffers_conf_php.option @@ -0,0 +1,7 @@ +### appended by script if PHP option chosen + +fastcgi_buffers 64 64k; +fastcgi_buffer_size 256k; +fastcgi_busy_buffers_size 3840k; + +# for sed -- just append to end of file diff --git a/etc/nginx/conf.d/buffers_withPHP.conf b/etc/nginx/conf.d/buffers_withPHP.conf deleted file mode 100644 index 59eb774..0000000 --- a/etc/nginx/conf.d/buffers_withPHP.conf +++ /dev/null @@ -1,11 +0,0 @@ -####### -### NGINX configuration - buffers -####### - -client_body_buffer_size 10k; -client_header_buffer_size 1k; -client_max_body_size 10M; -large_client_header_buffers 2 1k; -fastcgi_buffers 64 64k; -fastcgi_buffer_size 256k; -fastcgi_busy_buffers_size 3840k; diff --git a/etc/nginx/nginx.nophp.conf b/etc/nginx/nginx.conf similarity index 100% rename from etc/nginx/nginx.nophp.conf rename to etc/nginx/nginx.conf diff --git a/etc/nginx/nginx.php.conf b/etc/nginx/nginx.php.conf deleted file mode 100644 index 82365bc..0000000 --- a/etc/nginx/nginx.php.conf +++ /dev/null @@ -1,61 +0,0 @@ -####### -### NGINX basic configuration -### includes PHP upstream processor -####### - -user www-data; -worker_processes auto; -pid /var/run/nginx.pid; - -error_log /var/log/nginx/error.log warn; - -# include any dynamically linked modules -include /etc/nginx/modules/*.conf; - -events { - worker_connections 1024; - multi_accept off; - use epoll; -} - -http { - server_names_hash_bucket_size 64; - default_type text/plain; - charset utf-8; - - include /etc/nginx/mime.types; - - # include enabled configuration options from cond.d/enabled/*.conf - include /etc/nginx/conf.d/enabled/*.conf; - - # set default index options for all sites - index index.php index.html index.htm; - - # set default document root for all sites - root /usr/share/nginx/html; - - # PHP handler - upstream php-handler { - server 127.0.0.1:9000; - } - - # logging options - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for" ' - '"$host" server="$server_name" ' - 'reqtime="$request_time" ' - 'uaddr="$upstream_addr" ustat="$upstream_status" ' - 'utime="$upstream_response_time" ulen="$upstream_response_length" ' - 'cache="$upstream_cache_status"'; - - # turn logging off by default (performance reasons, uncomment for - # troubleshooting) - #access_log /var/log/nginx/access.log main; - access_log off; - - server_tokens off; - - # include enabled server blocks from /etc/nginx/enabledSites/*.conf - include /etc/nginx/enabledSites/*.conf; -} diff --git a/etc/nginx/nginx_conf_phphandler.option b/etc/nginx/nginx_conf_phphandler.option new file mode 100644 index 0000000..7d0c160 --- /dev/null +++ b/etc/nginx/nginx_conf_phphandler.option @@ -0,0 +1,21 @@ +### This is what the script should insert if PHP is selected + +## TCP option -- address and port should be variables, default here +## blank line after closing brace is intentional +# PHP handler (tcp) +upstream php-handler { + server 127.0.0.1:9000; +} + + +## Socket option -- php version should be variable, default here +## blank line after closing brace is intentional + +# PHP handler (socket) +upstream php-handler { + server unix:/run/php/php7.2-fpm.sock; +} + + +for sed: + append after root.*;$ \ No newline at end of file