updated nginx state
This commit is contained in:
parent
822b9138b1
commit
b824ba53ca
@ -8,6 +8,7 @@ nginx:
|
|||||||
dir: /etc/nginx
|
dir: /etc/nginx
|
||||||
user: www-data
|
user: www-data
|
||||||
group: www-data
|
group: www-data
|
||||||
|
php_socket_file: /var/run/php/php7.3-fpm.sock
|
||||||
subdirs:
|
subdirs:
|
||||||
- auth
|
- auth
|
||||||
- modules-available
|
- modules-available
|
||||||
|
@ -23,7 +23,7 @@ server {
|
|||||||
|
|
||||||
location ~ \.php?$ {
|
location ~ \.php?$ {
|
||||||
include fastcgi_params;
|
include fastcgi_params;
|
||||||
fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
|
fastcgi_pass unix:{{ nginx.config.php_socket_file }};
|
||||||
fastcgi_index index.php;
|
fastcgi_index index.php;
|
||||||
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ server {
|
|||||||
|
|
||||||
location ~ ^(.+?\.php)(/.*)?$ {
|
location ~ ^(.+?\.php)(/.*)?$ {
|
||||||
include fastcgi_params;
|
include fastcgi_params;
|
||||||
fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
|
fastcgi_pass unix:{{ nginx.config.php_socket_file }};
|
||||||
fastcgi_index index.php;
|
fastcgi_index index.php;
|
||||||
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
30
states/nginx/templates/types/rainloop.j2
Normal file
30
states/nginx/templates/types/rainloop.j2
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
|
||||||
|
|
||||||
|
server {
|
||||||
|
include http;
|
||||||
|
server_name {{ vhost_name }};
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
include https;
|
||||||
|
server_name {{ vhost_name }};
|
||||||
|
root {{ root_dir }};
|
||||||
|
|
||||||
|
index index.php index.html;
|
||||||
|
|
||||||
|
location ~ /(conf|bin|inc)/ {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /data/ {
|
||||||
|
internal;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php?$ {
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_pass unix:{{ nginx.config.php_socket_file }};
|
||||||
|
fastcgi_index index.php;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user