Update to 2021-11-25 17:00

master
Daniel Berteaud 3 years ago
parent c8fe1a2671
commit fa879b1992
  1. 8
      roles/nginx/templates/ansible_conf.d/30-vhosts.conf.j2
  2. 10
      roles/nginx/templates/nginx.conf.j2
  3. 2
      roles/repo_base/tasks/AlmaLinux-8.yml
  4. 4
      roles/unifi/defaults/main.yml

@ -10,18 +10,18 @@
server { server {
{% if vhost.port is iterable %} {% if vhost.port is iterable %}
{% for port in vhost.port %} {% for port in vhost.port %}
listen {{ port }}; listen {{ port }}{% if vhost.name == '_' %} default_server{% endif %};
{% endfor %} {% endfor %}
{% else %} {% else %}
listen {{ vhost.port }}; listen {{ vhost.port }}{% if vhost.name == '_' %} default_server{% endif %};
{% endif %} {% endif %}
{% if vhost.ssl.enabled %} {% if vhost.ssl.enabled %}
{% if vhost.ssl.port is iterable %} {% if vhost.ssl.port is iterable %}
{% for port in vhost.ssl.port %} {% for port in vhost.ssl.port %}
listen {{ port }} ssl http2; listen {{ port }} ssl http2{% if vhost.name == '_' %} default_server{% endif %};
{% endfor %} {% endfor %}
{% else %} {% else %}
listen {{ vhost.ssl.port }} ssl http2; listen {{ vhost.ssl.port }} ssl http2{% if vhost.name == '_' %} default_server{% endif %};
{% endif %} {% endif %}
{% if vhost.ssl.cert is defined and vhost.ssl.key is defined %} {% if vhost.ssl.cert is defined and vhost.ssl.key is defined %}

@ -76,6 +76,7 @@ http {
https 'max-age=31536000'; https 'max-age=31536000';
} }
{% if '_' not in nginx_vhosts | map(attribute='name') | list %}
server { server {
listen 80 default_server; listen 80 default_server;
listen 443 default_server ssl http2; listen 443 default_server ssl http2;
@ -96,16 +97,9 @@ http {
location / { location / {
} }
# error_page 404 /404.html;
# location = /40x.html {
# }
#
# error_page 500 502 503 504 /50x.html;
# location = /50x.html {
# }
location ~ \.ht { location ~ \.ht {
deny all; deny all;
} }
} }
{% endif %}
} }

@ -3,7 +3,7 @@
- name: Configure repositories - name: Configure repositories
yum_repository: yum_repository:
file: "{{ item.file }}" file: "{{ item.file }}"
description: "CentOS {{ item.name }}" description: "AlmaLinux {{ item.name }}"
name: "{{ item.name }}" name: "{{ item.name }}"
baseurl: https://repo.almalinux.org/almalinux/$releasever/{{ item.dir }}/$basearch/os/ baseurl: https://repo.almalinux.org/almalinux/$releasever/{{ item.dir }}/$basearch/os/
gpgcheck: True gpgcheck: True

@ -1,9 +1,9 @@
--- ---
unifi_root_dir: /opt/unifi unifi_root_dir: /opt/unifi
unifi_version: 6.4.54 unifi_version: 6.5.53
unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip
unifi_archive_sha1: c901dcce76dafdd9d7a07b5de1c99696469f2034 unifi_archive_sha1: 17fc9cf63ffc24d38d2a9723ae6437e1161675db
unifi_manage_upgrade: True unifi_manage_upgrade: True
unifi_http_port: 8080 unifi_http_port: 8080
unifi_https_port: 8443 unifi_https_port: 8443

Loading…
Cancel
Save