SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switching master to PHP7

Browse Source
This commit is contained in:
Ric Harvey
2017-01-03 09:19:57 +00:00
parent 024ece2ce3
commit bc75013ac4
8 changed files with 73 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
conf/nginx-site-ssl.conf
View File

@@ -1,6 +1,6 @@
server {
listen 443 ssl;
listen [::]:443 ssl ipv6only=on; ## listen for ipv6
listen [::]:443 ssl ipv6only=on; ## listen for ipv6
root /var/www/html;
index index.php index.html index.htm;
@@ -29,7 +29,7 @@ server {
try_files $uri $uri/ =404;
}
error_page 404 /404.html;
error_page 404 /404.html;
location = /404.html {
root /var/www/errors;
internal;
@@ -67,8 +67,8 @@ server {
log_not_found off;
deny all;
}
location ^~ /.well-known {
location ^~ /.well-known {
allow all;
auth_basic off;
}

6
conf/nginx-site.conf
View File

@@ -22,7 +22,7 @@ server {
try_files $uri $uri/ =404;
}
error_page 404 /404.html;
error_page 404 /404.html;
location = /404.html {
root /var/www/errors;
internal;
@@ -60,8 +60,8 @@ server {
log_not_found off;
deny all;
}
location ^~ /.well-known {
location ^~ /.well-known {
allow all;
auth_basic off;
}

3
conf/nginx.conf
View File

@@ -16,7 +16,7 @@ events {
http {
include mime.types;
default_type application/octet-stream;
disable_symlinks off;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
@@ -29,6 +29,7 @@ http {
#keepalive_timeout 0;
keepalive_timeout 2;
client_max_body_size 100m;
server_tokens off;
#gzip on;

4
conf/supervisord.conf
View File

@@ -21,8 +21,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///dev/shm/supervisor.sock ; use a unix:// URL for a unix socket
[program:php-fpm]
command = /usr/bin/php-fpm -c /etc/php
[program:php-fpm7]
command = /usr/sbin/php-fpm7 --nodaemonize --fpm-config /etc/php7/php-fpm.d/www.conf
autostart=true
autorestart=true
priority=5