Remove domain split config

This commit is contained in:
Alexander Dietrich 2018-04-01 02:21:05 +02:00
parent 15de2e680e
commit 26edd061c7
2 changed files with 0 additions and 16 deletions

View file

@ -10,11 +10,6 @@
group: "{{ updates_group }}" group: "{{ updates_group }}"
state: directory state: directory
- name: copy updates_domains.conf
copy:
src: updates_domains.conf
dest: /etc/nginx/include
- name: template site - name: template site
template: template:
src: templates/site.j2 src: templates/site.j2

View file

@ -1,5 +1,3 @@
include /etc/nginx/include/node_hierarchy.conf;
{% if updates_ssl_certificate is defined %} {% if updates_ssl_certificate is defined %}
server { server {
listen 443 ssl; listen 443 ssl;
@ -11,18 +9,11 @@ server {
ssl_certificate_key {{ updates_ssl_certificate_key }}; ssl_certificate_key {{ updates_ssl_certificate_key }};
root {{ updates_root }}; root {{ updates_root }};
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf; include /etc/nginx/include/listing.conf;
location / { location / {
include /etc/nginx/include/headers_hsts.conf; include /etc/nginx/include/headers_hsts.conf;
} }
location = /config {
root /etc/nginx/include;
try_files /node_hierarchy.conf =404;
default_type text/plain;
}
} }
{% endif %} {% endif %}
@ -34,7 +25,6 @@ server {
server_name updates.hamburg.freifunk.net; server_name updates.hamburg.freifunk.net;
root {{ updates_root }}; root {{ updates_root }};
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf; include /etc/nginx/include/listing.conf;
{% if updates_letsencrypt_local %} {% if updates_letsencrypt_local %}
@ -57,6 +47,5 @@ server {
server_name *.updates.services.ffhh; server_name *.updates.services.ffhh;
root {{ updates_root }}; root {{ updates_root }};
include /etc/nginx/include/updates_domains.conf;
include /etc/nginx/include/listing.conf; include /etc/nginx/include/listing.conf;
} }