CCCHH/ansible-infra
CCCHH/ansible-infra
18
0
Fork 0
Code Issues 5 Pull requests Wiki Activity

Deploy certs for wiki.ccchh.net using certbot role

Browse source 
Also clean up NGINX configurations.
This commit is contained in:
June 2023-08-02 23:17:31 +02:00 committed by julian
parent 6651f4568d
commit 6ac4bf8240
5 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
inventories/z9/host_vars/wiki.yaml
View file

@ -1,13 +1,9 @@
nginx__version_spec: "" nginx__version_spec: ""
nginx__deploy_redirect_conf: false
nginx__configurations: nginx__configurations:
- name: http_handler
content: "{{ lookup('ansible.builtin.file', 'configs/wiki/nginx/http_handler.conf') }}"
- name: wiki.ccchh.net - name: wiki.ccchh.net
content: "{{ lookup('ansible.builtin.file', 'configs/wiki/nginx/wiki.ccchh.net.conf') }}" content: "{{ lookup('ansible.builtin.file', 'configs/wiki/nginx/wiki.ccchh.net.conf') }}"
cert__acme_account_email: j+letsencrypt-ccchh@jsts.xyz certbot__version_spec: ""
cert__domains: certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz
certbot__certificate_domains:
- "wiki.ccchh.net" - "wiki.ccchh.net"
cert__bind_9_host: authoritative-dns
cert__bind_9_zone: ccchh.net

2
inventories/z9/hosts.yaml
View file

@ -52,12 +52,12 @@ all:
cert_hosts: cert_hosts:
hosts: hosts:
esphome: esphome:
wiki:
engelsystem: engelsystem:
certbot_hosts: certbot_hosts:
hosts: hosts:
zigbee2mqtt: zigbee2mqtt:
keycloak: keycloak:
wiki:
ssh_server_config_hosts: ssh_server_config_hosts:
hosts: hosts:
keycloak: keycloak:

2
playbooks/files/configs/public-reverse-proxy/nginx/acme_challenge.conf
View file

@ -6,7 +6,7 @@ map $host $upstream_acme_challenge_host {
thinkcccore1.ccchh.net 10.31.242.4; thinkcccore1.ccchh.net 10.31.242.4;
thinkcccore2.ccchh.net 10.31.242.5; thinkcccore2.ccchh.net 10.31.242.5;
thinkcccore3.ccchh.net 10.31.242.6; thinkcccore3.ccchh.net 10.31.242.6;
wiki.ccchh.net 10.31.206.13; wiki.ccchh.net 10.31.206.13:31820;
zigbee2mqtt.ccchh.net 10.31.208.25:31820; zigbee2mqtt.ccchh.net 10.31.208.25:31820;
id.ccchh.net 10.31.206.12:31820; id.ccchh.net 10.31.206.12:31820;
keycloak-admin.ccchh.net 10.31.206.12:31820; keycloak-admin.ccchh.net 10.31.206.12:31820;

14
playbooks/files/configs/wiki/nginx/http_handler.conf
View file

@ -1,14 +0,0 @@
server {
listen 80 default_server;
#listen [::]:80 default_server;
server_name _;
location /.well-known/acme-challenge/ {
autoindex on;
root /webroot-for-acme-challenge;
}
location / {
return 301 https://$host$request_uri;
}
}

6
playbooks/files/configs/wiki/nginx/wiki.ccchh.net.conf
View file

@ -14,10 +14,10 @@ server {
server_name wiki.ccchh.net; server_name wiki.ccchh.net;
ssl_certificate /etc/ansible_certs/certs/wiki.ccchh.net/fullchain.pem; ssl_certificate /etc/letsencrypt/live/wiki.ccchh.net/fullchain.pem;
ssl_certificate_key /etc/ansible_certs/certs/wiki.ccchh.net/privkey.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 # verify chain of trust of OCSP response using Root CA and Intermediate certs
ssl_trusted_certificate /etc/ansible_certs/certs/wiki.ccchh.net/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/wiki.ccchh.net/chain.pem;
# HSTS (ngx_http_headers_module is required) (63072000 seconds) # HSTS (ngx_http_headers_module is required) (63072000 seconds)
add_header Strict-Transport-Security "max-age=63072000" always; add_header Strict-Transport-Security "max-age=63072000" always;