Skip to content
GitLab
Commit 7dfd6c00 authored by Grazyna Jaworska's avatar Grazyna Jaworska
Browse files

Nginx: Sync config templates.

parent a7311d9e
Hide whitespace changes
Inline Side-by-side
http/Provision/Config/Nginx/Inc/vhost_include.tpl.php
View file @ 7dfd6c00
......@@ -171,7 +171,9 @@ location = /fpm-status {
access_log off;
allow 127.0.0.1;
deny all;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -185,7 +187,9 @@ location = /fpm-ping {
access_log off;
allow 127.0.0.1;
deny all;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -207,7 +211,9 @@ location = /cron.php {
deny all;
<?php endif; ?>
try_files $uri =404;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -227,7 +233,9 @@ location = /core/cron.php {
deny all;
<?php endif; ?>
try_files $uri =404;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -808,7 +816,9 @@ location ~* /(?:modules|libraries)/(?:contrib/)?(?:ad|tinybrowser|f?ckeditor|tin
return 403;
}
try_files $uri =404;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -951,7 +961,13 @@ location ~ ^/(?<esi>esi/.*)"$ {
###
fastcgi_param QUERY_STRING q=$esi;
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
<?php endif; ?>
###
### Use Nginx cache for all visitors.
###
......@@ -1090,7 +1106,9 @@ location = /index.php {
tcp_nopush off;
keepalive_requests 0;
try_files $uri =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -1141,7 +1159,9 @@ location ~* ^/(?:index|cron|boost_stats|update|authorize)\.php$ {
keepalive_requests 0;
access_log off;
try_files $uri =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -1169,7 +1189,9 @@ location @allowupdate {
keepalive_requests 0;
access_log off;
try_files $uri =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......
http/Provision/Config/Nginx/subdir.tpl.php
View file @ 7dfd6c00
......@@ -233,7 +233,9 @@ location ^~ /<?php print $subdir; ?> {
deny all;
<?php endif; ?>
try_files /cron.php $uri =404;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -610,7 +612,9 @@ location ^~ /<?php print $subdir; ?> {
return 403;
}
try_files /$1 $uri =404;
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -791,10 +795,12 @@ location ^~ /<?php print $subdir; ?> {
keepalive_requests 0;
access_log off;
try_files /$1.php =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php5-fpm.sock;
<?php endif; ?>
}
......@@ -865,7 +871,9 @@ location ^~ /<?php print $subdir; ?> {
tcp_nopush off;
keepalive_requests 0;
try_files /index.php =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......@@ -1007,7 +1015,9 @@ location @allowupdate_<?php print $subdir; ?> {
access_log off;
try_files /$real_fastcgi_script_name =404; ### check for existence of php file first
<?php if ($phpfpm_mode == 'port'): ?>
<?php if ($satellite_mode == 'boa'): ?>
fastcgi_pass unix:/var/run/www53.fpm.socket;
<?php elseif ($phpfpm_mode == 'port'): ?>
fastcgi_pass 127.0.0.1:9000;
<?php else: ?>
fastcgi_pass unix:/var/run/php5-fpm.sock;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment