mirror of
https://github.com/DO1JLR/ansible_playbook_servers.git
synced 2024-09-14 19:53:56 +02:00
update
This commit is contained in:
parent
4ec12b85a0
commit
a561b3f10b
11 changed files with 23 additions and 46 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 2ed8bdc8e83dbf52318c10f20fbb12ecdf158c0b
|
Subproject commit 12a1c25f5eba26a9b436f4669fef1b5563056e3e
|
|
@ -1 +1 @@
|
||||||
Subproject commit 288dc5be2c24fe3b837c60375206fceb45574622
|
Subproject commit 54b2163c56002cee40d888a2af566acd92705488
|
|
@ -1 +1 @@
|
||||||
Subproject commit f88f40086d287798c02bd3fdae641234c85c2edc
|
Subproject commit e00e82b0ca5a20cfa744afeff9a98cd141b937aa
|
|
@ -120,6 +120,7 @@ nginx_sites:
|
||||||
- name: 'c3woc.org'
|
- name: 'c3woc.org'
|
||||||
- name: 'waffel.li'
|
- name: 'waffel.li'
|
||||||
- name: 'www.waffel.li'
|
- name: 'www.waffel.li'
|
||||||
|
- name: 'www.camp.waffel.li'
|
||||||
- name: 'www.c3woc.org'
|
- name: 'www.c3woc.org'
|
||||||
- name: 'c3woc.eu'
|
- name: 'c3woc.eu'
|
||||||
- name: 'www.c3woc.eu'
|
- name: 'www.c3woc.eu'
|
||||||
|
@ -175,9 +176,6 @@ nginx_sites:
|
||||||
webroot:
|
webroot:
|
||||||
user: 'winkekatze'
|
user: 'winkekatze'
|
||||||
- name: 'www.winkekatze.tv'
|
- name: 'www.winkekatze.tv'
|
||||||
- name: 'm2.xn--see-br-0xa.se'
|
|
||||||
webroot:
|
|
||||||
user: 'm2'
|
|
||||||
- name: 'klima-streik.de'
|
- name: 'klima-streik.de'
|
||||||
webroot:
|
webroot:
|
||||||
user: 'klima'
|
user: 'klima'
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6a6d06020e4b545f76153a434cb21a895cb80a92
|
Subproject commit 9be7f6161a5eea40014c0b1c0c2d4fc4f342a549
|
|
@ -1 +1 @@
|
||||||
Subproject commit 09237814011e684fb24a484bdd3c77de0aebc24f
|
Subproject commit 8f0eef93c743ef38a9252a1d6d61e7fb83d1cfcd
|
|
@ -1 +1 @@
|
||||||
Subproject commit a7723eb017c618611da37531e5961632d9ae03b0
|
Subproject commit 4d95a289cb41c187fdd6aeef7d8e31af592ecb7a
|
|
@ -1 +1 @@
|
||||||
Subproject commit f1306ef67475a1d5fee59429de226ddc37922134
|
Subproject commit dbfdb7f50e8c762fb5e36e970f32d002f2930934
|
|
@ -1 +1 @@
|
||||||
Subproject commit 3619bcf963c4c82245cf9fe58efbdddff84de193
|
Subproject commit cec391015fc335a756dfd5f7a869e16d72539585
|
|
@ -1,35 +0,0 @@
|
||||||
server {
|
|
||||||
listen 443 ssl http2;
|
|
||||||
listen [::]:443 ssl http2;
|
|
||||||
|
|
||||||
server_name m2.xn--see-br-0xa.se m2.see-bör.se;
|
|
||||||
|
|
||||||
include snippets/tls_parameters_{{ site.name }}.snippet.conf;
|
|
||||||
include snippets/tls_certificate_{{ site.name }}.snippet.conf;
|
|
||||||
include snippets/logging_{{ site.name }}.snippet.conf;
|
|
||||||
|
|
||||||
root /srv/www/m2.xn--see-br-0xa.se;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
add_header X-Served-By "teapot CYBER 4.0 (with blockchain)";
|
|
||||||
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
|
|
||||||
charset utf-8;
|
|
||||||
try_files $uri $uri/ =404;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# redirect UTF-8 encoded domain... just in case
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
|
|
||||||
server_name m2.see-bör.se;
|
|
||||||
|
|
||||||
include snippets/logging_{{ site.name }}.snippet.conf;
|
|
||||||
|
|
||||||
include snippets/acmetool.snippet.conf;
|
|
||||||
|
|
||||||
location ^~ / {
|
|
||||||
return 308 https://m2.xn--see-br-0xa.se$request_uri;
|
|
||||||
}
|
|
||||||
}
|
|
14
templates/files/nginx/sites/www.camp.waffel.li_tls.conf
Normal file
14
templates/files/nginx/sites/www.camp.waffel.li_tls.conf
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
server {
|
||||||
|
listen 443 ssl http2;
|
||||||
|
listen [::]:443 ssl http2;
|
||||||
|
|
||||||
|
server_name www.camp.waffel.li;
|
||||||
|
|
||||||
|
include snippets/tls_parameters_{{ site.name }}.snippet.conf;
|
||||||
|
include snippets/tls_certificate_{{ site.name }}.snippet.conf;
|
||||||
|
include snippets/logging_{{ site.name }}.snippet.conf;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
return 308 https://camp.waffel.li$request_uri;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue