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 2020-09-02 21:31:18 +02:00
parent ced07392af
commit 25e21f2042
6 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
states/nginx/config.sls
View File

@ -58,6 +58,7 @@ nginx-sites-available-{{ key }}:
root_dir: {{ vhost.root_dir|default(None) }} root_dir: {{ vhost.root_dir|default(None) }}
internal_access: {{ vhost.internal_access|default(false) }} internal_access: {{ vhost.internal_access|default(false) }}
dirs: {{ vhost.dirs|default([]) }} dirs: {{ vhost.dirs|default([]) }}
php_socket_file: {{ nginx.config.php_socket_file }}
nginx-site-enabled-{{ key }}: nginx-site-enabled-{{ key }}:
file.symlink: file.symlink:

2
states/nginx/templates/ssl_params.j2
View File

@ -4,7 +4,7 @@ ssl_certificate /etc/acme/certs/paulbsd.com.cert;
ssl_certificate_key /etc/acme/keys/paulbsd.com.key; ssl_certificate_key /etc/acme/keys/paulbsd.com.key;
ssl_session_timeout 5m; ssl_session_timeout 5m;
#ssl_protocols SSLv2 SSLv3 TLSv1 TLSv1.1 TLSv1.2; #ssl_protocols SSLv2 SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1.2; ssl_protocols TLSv1.3 TLSv1.2;
#ssl_ciphers HIGH:!aNULL:!MD5; #ssl_ciphers HIGH:!aNULL:!MD5;
#ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384; #ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20; ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20;

16
states/nginx/templates/types/dokuwiki.j2
View File

@ -1,20 +1,20 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
server { server {
include http; include http;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
return 301 https://$server_name$request_uri; return 301 https://$server_name$request_uri;
} }
server { server {
include https; include https;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
root {{ root_dir }}; root {{ root_dir }};
index index.php index.html; index index.php index.html;
location ~ /(conf|bin|inc)/ { location ~ /(conf|bin|inc)/ {
deny all; deny all;
} }
location ~ /data/ { location ~ /data/ {

12
states/nginx/templates/types/nextcloud.j2
View File

@ -1,15 +1,15 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
server { server {
include http; include http;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
return 301 https://$server_name$request_uri; return 301 https://$server_name$request_uri;
} }
server { server {
include https; include https;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
root {{ root_dir }}; root {{ root_dir }};
index index.php; index index.php;
error_page 403 /core/templates/403.php; error_page 403 /core/templates/403.php;

18
states/nginx/templates/types/rainloop.j2
View File

@ -1,20 +1,20 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
server { server {
include http; include http;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
return 301 https://$server_name$request_uri; return 301 https://$server_name$request_uri;
} }
server { server {
include https; include https;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
root {{ root_dir }}; root {{ root_dir }};
index index.php index.html; index index.php index.html;
location ~ /(conf|bin|inc)/ { location ~ /(conf|bin|inc)/ {
deny all; deny all;
} }
location ~ /data/ { location ~ /data/ {
@ -23,7 +23,7 @@ server {
location ~ \.php?$ { location ~ \.php?$ {
include fastcgi_params; include fastcgi_params;
fastcgi_pass unix:{{ nginx.config.php_socket_file }}; fastcgi_pass unix:{{ 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;
} }

24
states/nginx/templates/types/simple.j2
View File

@ -1,34 +1,34 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
server { server {
include http; include http;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
return 301 https://$server_name$request_uri; return 301 https://$server_name$request_uri;
} }
server { server {
include https; include https;
server_name {{ vhost_name }}; server_name {{ vhost_name }};
{%- if not proxy %} {%- if not proxy %}
root {{ root_dir }}; root {{ root_dir }};
{%- endif %} {%- endif %}
location / { location / {
{%- if proxy %} {%- if proxy %}
proxy_pass {{ proxy_pass }}; proxy_pass {{ proxy_pass }};
{%- if not cache %} {%- if not cache %}
proxy_no_cache 1; proxy_no_cache 1;
proxy_cache_bypass 1; proxy_cache_bypass 1;
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- if autoindex %} {%- if autoindex %}
autoindex on; autoindex on;
autoindex_localtime on; autoindex_localtime on;
{%- endif %} {%- endif %}
} }
{%- for dir in dirs %} {%- for dir in dirs %}
location {{ dir.name }} { location {{ dir.name }} {
alias {{ dir.alias }}; alias {{ dir.alias }};
} }
{%- endfor %} {%- endfor %}
} }