wiki.ccchh.net is not longer in the dns
so we remove it from all other configs as well
This commit is contained in:
parent
311404a6be
commit
be76c3d792
4 changed files with 0 additions and 31 deletions
|
|
@ -1,13 +1,10 @@
|
||||||
nginx__version_spec: ""
|
nginx__version_spec: ""
|
||||||
nginx__configurations:
|
nginx__configurations:
|
||||||
- name: wiki.ccchh.net
|
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf') }}"
|
|
||||||
- name: wiki.hamburg.ccc.de
|
- name: wiki.hamburg.ccc.de
|
||||||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf') }}"
|
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf') }}"
|
||||||
|
|
||||||
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
|
||||||
certbot__certificate_domains:
|
certbot__certificate_domains:
|
||||||
- "wiki.ccchh.net"
|
|
||||||
- "wiki.hamburg.ccc.de"
|
- "wiki.hamburg.ccc.de"
|
||||||
certbot__new_cert_commands:
|
certbot__new_cert_commands:
|
||||||
- "systemctl reload nginx.service"
|
- "systemctl reload nginx.service"
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ map $host $upstream_acme_challenge_host {
|
||||||
pad.hamburg.ccc.de pad.hosts.hamburg.ccc.de:31820;
|
pad.hamburg.ccc.de pad.hosts.hamburg.ccc.de:31820;
|
||||||
spaceapi.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
spaceapi.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
staging.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
staging.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
wiki.ccchh.net wiki.hosts.hamburg.ccc.de:31820;
|
|
||||||
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:31820;
|
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:31820;
|
||||||
www.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
www.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
tickets.hamburg.ccc.de tickets.hosts.hamburg.ccc.de:31820;
|
tickets.hamburg.ccc.de tickets.hosts.hamburg.ccc.de:31820;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ stream {
|
||||||
invite.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:8443;
|
invite.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:8443;
|
||||||
keycloak-admin.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:8443;
|
keycloak-admin.hamburg.ccc.de keycloak.hosts.hamburg.ccc.de:8443;
|
||||||
grafana.hamburg.ccc.de grafana.hosts.hamburg.ccc.de:8443;
|
grafana.hamburg.ccc.de grafana.hosts.hamburg.ccc.de:8443;
|
||||||
wiki.ccchh.net wiki.hosts.hamburg.ccc.de:8443;
|
|
||||||
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:8443;
|
wiki.hamburg.ccc.de wiki.hosts.hamburg.ccc.de:8443;
|
||||||
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:8443;
|
onlyoffice.hamburg.ccc.de onlyoffice.hosts.hamburg.ccc.de:8443;
|
||||||
hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
hackertours.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
# partly generated 2022-01-08, Mozilla Guideline v5.6, nginx 1.17.7, OpenSSL 1.1.1k, intermediate configuration
|
|
||||||
# https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6
|
|
||||||
server {
|
|
||||||
# Listen on a custom port for the proxy protocol.
|
|
||||||
listen [::]:8443 ssl http2 proxy_protocol;
|
|
||||||
# Make use of the ngx_http_realip_module to set the $remote_addr and
|
|
||||||
# $remote_port to the client address and client port, when using proxy
|
|
||||||
# protocol.
|
|
||||||
# First set our proxy protocol proxy as trusted.
|
|
||||||
set_real_ip_from 2a00:14b0:4200:3000:125::1;
|
|
||||||
# Then tell the realip_module to get the addreses from the proxy protocol
|
|
||||||
# header.
|
|
||||||
real_ip_header proxy_protocol;
|
|
||||||
|
|
||||||
server_name wiki.ccchh.net;
|
|
||||||
|
|
||||||
ssl_certificate /etc/letsencrypt/live/wiki.ccchh.net/fullchain.pem;
|
|
||||||
ssl_certificate_key /etc/letsencrypt/live/wiki.ccchh.net/privkey.pem;
|
|
||||||
# verify chain of trust of OCSP response using Root CA and Intermediate certs
|
|
||||||
ssl_trusted_certificate /etc/letsencrypt/live/wiki.ccchh.net/chain.pem;
|
|
||||||
|
|
||||||
# HSTS (ngx_http_headers_module is required) (63072000 seconds)
|
|
||||||
add_header Strict-Transport-Security "max-age=63072000" always;
|
|
||||||
|
|
||||||
return 302 https://wiki.hamburg.ccc.de$request_uri;
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue