paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated nginx state

Browse Source
This commit is contained in:
Paul 2024-01-03 13:29:16 +01:00
parent 2328adc1db
commit e23e94d12d
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
states/nginx/defaults.yaml
View File

@ -13,6 +13,8 @@ nginx:
workers: 4 workers: 4
http_port: 8080 http_port: 8080
https_port: 4443 https_port: 4443
http_proxy_port: 8081
https_proxy_port: 4444
php_socket_file: /run/php/php-fpm.sock php_socket_file: /run/php/php-fpm.sock
subdirs: subdirs:
- auth - auth

6
states/nginx/templates/http.j2
View File

@ -1,5 +1,7 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
{%- from "nginx/map.jinja" import nginx with context %} {%- from "nginx/map.jinja" import nginx with context %}
listen {{ nginx.config.http_port }} proxy_protocol; listen {{ nginx.config.http_port }};
listen [::]:{{ nginx.config.http_port }} proxy_protocol; listen [::]:{{ nginx.config.http_port }};
listen {{ nginx.config.http_proxy_port }} proxy_protocol;
listen [::]:{{ nginx.config.http_proxy_port }} proxy_protocol;

6
states/nginx/templates/https.j2
View File

@ -1,5 +1,7 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
{%- from "nginx/map.jinja" import nginx with context %} {%- from "nginx/map.jinja" import nginx with context %}
listen {{ nginx.config.https_port }} ssl http2 proxy_protocol; listen {{ nginx.config.https_port }} ssl http2;
listen [::]:{{ nginx.config.https_port }} ssl http2 proxy_protocol; listen [::]:{{ nginx.config.https_port }} ssl http2;
listen {{ nginx.config.https_proxy_port }} ssl http2 proxy_protocol;
listen [::]:{{ nginx.config.https_proxy_port }} ssl http2 proxy_protocol;

12
states/nginx/templates/nginx.conf.j2
View File

@ -72,11 +72,15 @@ http {
gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml; gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml;
server { server {
listen {{ nginx.config.http_port }} default_server proxy_protocol; listen {{ nginx.config.http_port }} default_server;
listen [::]:{{ nginx.config.http_port }} default_server proxy_protocol; listen [::]:{{ nginx.config.http_port }} default_server;
listen {{ nginx.config.http_proxy_port }} default_server proxy_protocol;
listen [::]:{{ nginx.config.http_proxy_port }} default_server proxy_protocol;
listen {{ nginx.config.https_port }} default_server ssl http2 proxy_protocol; listen {{ nginx.config.https_port }} default_server ssl http2;
listen [::]:{{ nginx.config.https_port }} default_server ssl http2 proxy_protocol; listen [::]:{{ nginx.config.https_port }} default_server ssl http2;
listen {{ nginx.config.https_proxy_port }} default_server ssl http2 proxy_protocol;
listen [::]:{{ nginx.config.https_proxy_port }} default_server ssl http2 proxy_protocol;
root /var/www/html; root /var/www/html;
index index.html; index index.html;