Update updates website
This commit is contained in:
parent
2e5de83a17
commit
91e7dea03d
|
@ -1,5 +1,4 @@
|
||||||
---
|
---
|
||||||
site: updates
|
|
||||||
updates_group: ffupdates
|
updates_group: ffupdates
|
||||||
updates_letsencrypt: local
|
updates_letsencrypt: local
|
||||||
updates_owner: ffupdates
|
updates_owner: ffupdates
|
||||||
|
|
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
- name: template site
|
- name: template site
|
||||||
template:
|
template:
|
||||||
src: templates/site.j2
|
src: updates
|
||||||
dest: /etc/nginx/sites-available/{{ site }}
|
dest: /etc/nginx/sites-available/
|
||||||
notify: reload nginx
|
notify: reload nginx
|
||||||
|
|
||||||
- name: enable site
|
- name: enable site
|
||||||
file:
|
file:
|
||||||
src: ../sites-available/{{ site }}
|
src: /etc/nginx/sites-available/updates
|
||||||
dest: /etc/nginx/sites-enabled/{{ site }}
|
dest: /etc/nginx/sites-enabled/updates
|
||||||
state: link
|
state: link
|
||||||
notify: reload nginx
|
notify: reload nginx
|
||||||
|
|
|
@ -11,6 +11,7 @@ server {
|
||||||
include snippets/no-unsafe-files.conf;
|
include snippets/no-unsafe-files.conf;
|
||||||
|
|
||||||
root {{ updates_root }};
|
root {{ updates_root }};
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
# First attempt to serve request as file, then
|
# First attempt to serve request as file, then
|
||||||
# as directory, then fall back to displaying a 404.
|
# as directory, then fall back to displaying a 404.
|
||||||
|
@ -23,7 +24,7 @@ server {
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# Kein HTTPS Redirect wg. Paketinstallation auf Routern
|
# Kein HTTPS Redirect wg. Paketinstallation auf Routern
|
||||||
server {
|
server {
|
||||||
server_name updates.hamburg.freifunk.net;
|
server_name updates.hamburg.freifunk.net updates-a.hamburg.freifunk.net updates-b.hamburg.freifunk.net;
|
||||||
listen 80;
|
listen 80;
|
||||||
listen [::]:80;
|
listen [::]:80;
|
||||||
|
|
||||||
|
@ -34,20 +35,11 @@ server {
|
||||||
root {{ updates_root }};
|
root {{ updates_root }};
|
||||||
|
|
||||||
{% if updates_letsencrypt == 'local' %}
|
{% if updates_letsencrypt == 'local' %}
|
||||||
include snippets/location-acme.conf;
|
location ^~ /.well-known/acme-challenge {
|
||||||
|
root /var/www/_acme-challenge;
|
||||||
|
access_log off;
|
||||||
|
}
|
||||||
{% elif updates_letsencrypt == 'srv01' %}
|
{% elif updates_letsencrypt == 'srv01' %}
|
||||||
include snippets/location-acme-srv01.conf;
|
include snippets/location-acme-srv01.conf;
|
||||||
{% endif %}
|
{% endif %}
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
|
||||||
server_name updates-a.hamburg.freifunk.net updates-b.hamburg.freifunk.net;
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
|
|
||||||
include snippets/autoindex.conf;
|
|
||||||
include snippets/header-security.conf;
|
|
||||||
include snippets/no-unsafe-files.conf;
|
|
||||||
|
|
||||||
root {{ updates_root }};
|
|
||||||
}
|
|
Loading…
Reference in a new issue