jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-16 10:13:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-02-13 22:00

Browse Source
This commit is contained in:
Daniel Berteaud 2022-02-13 22:00:06 +01:00
parent 1689aa1152
commit f8e97439c5
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/nginx/defaults/main.yml
View File

@ -27,6 +27,9 @@ nginx_key_path: /etc/nginx/ssl/key.pem
# #
# nginx_letsencrypt_cert: # nginx_letsencrypt_cert:
# Default nginx vhost
# You can override it if you want to use a custom _ vhost
nginx_default_vhost_name: _
nginx_vhosts: [] nginx_vhosts: []
nginx_default_vhost_base: nginx_default_vhost_base:
aliases: [] aliases: []

4
roles/nginx/templates/ansible_conf.d/30-vhosts.conf.j2
View File

@ -135,8 +135,10 @@ server {
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if vhost.csp %} {% if vhost.csp is string and vhost.csp != '' %}
add_header Content-Security-Policy "{{ vhost.csp + (vhost.csp is search('connect-src') and vhost.proxy.websocket) | ternary('', '; connect-src \'self\' wss://' + vhost.name) }}"; add_header Content-Security-Policy "{{ vhost.csp + (vhost.csp is search('connect-src') and vhost.proxy.websocket) | ternary('', '; connect-src \'self\' wss://' + vhost.name) }}";
{% elif vhost.csp is mapping %}
add_header Content-Security-Policy "{% for csp in vhost.csp.keys() | list %}{{ csp }} {{ vhost.csp[csp] }}{% if not loop.last %}; {% endif %}{% endfor %}";
{% endif %} {% endif %}
{% if vhost.auth == 'llng' or vhost.auth == 'llng_basic' %} {% if vhost.auth == 'llng' or vhost.auth == 'llng_basic' %}

6
roles/nginx/templates/nginx.conf.j2
View File

@ -78,10 +78,10 @@ http {
{% if '_' not in nginx_vhosts | map(attribute='name') | list %} {% if '_' not in nginx_vhosts | map(attribute='name') | list %}
server { server {
listen 80 default_server; listen 80{% if nginx_default_vhost_name == '_' %} default_server{% endif %};
listen 443 default_server ssl http2; listen 443{% if nginx_default_vhost_name == '_' %} default_server{% endif %} ssl http2;
server_name _; server_name {{ nginx_default_vhost_name }};
root /usr/share/nginx/html; root /usr/share/nginx/html;
# Load location fragments in the default vhost # Load location fragments in the default vhost

1
roles/squid/files/acl/software_various.domains
View File

@ -159,6 +159,7 @@ download.java.net
forumarchivebuilder.googlecode.com forumarchivebuilder.googlecode.com
maven.java.net maven.java.net
redshift-maven-repository.s3-website-us-east-1.amazonaws.com redshift-maven-repository.s3-website-us-east-1.amazonaws.com
maven.repository.redhat.com
# Unifi # Unifi
www.ubnt.com www.ubnt.com