diff --git a/filter_plugins/__pycache__/ipaddr.cpython-39.pyc b/filter_plugins/__pycache__/ipaddr.cpython-39.pyc index 0c1484f..da8c8f4 100644 Binary files a/filter_plugins/__pycache__/ipaddr.cpython-39.pyc and b/filter_plugins/__pycache__/ipaddr.cpython-39.pyc differ diff --git a/playbooks/mrwho/dns-local.yml b/playbooks/mrwho/dns-local.yml index 02224b9..4e58ca5 100644 --- a/playbooks/mrwho/dns-local.yml +++ b/playbooks/mrwho/dns-local.yml @@ -83,9 +83,13 @@ ip: 172.20.21.105 - name: sad ip: 172.20.21.109 - - name: rke-master01 - ip: 172.20.21.210 - - name: rancher - ip: 172.20.21.210 - - name: rke-node01 - ip: 172.20.21.211 + - name: k8s-manager + ip: 172.20.21.200 + - name: k8s-master01 + ip: 172.20.21.201 + - name: k8s-worker01 + ip: 172.20.21.202 + - name: kubernetes + ip: 172.20.21.100 + - name: longhorn + ip: 172.20.21.100 diff --git a/playbooks/mrwho/router-nginx.yml b/playbooks/mrwho/router-nginx.yml index 852a7cf..a4042c7 100644 --- a/playbooks/mrwho/router-nginx.yml +++ b/playbooks/mrwho/router-nginx.yml @@ -30,13 +30,13 @@ # - nginx-cors.conf nginx_streams: - stream: NTP + type: normal listen_port: 123 protocol: udp responses: 1 timeout: 3 backends: - - 10.203.2.11:123 - - 10.203.2.12:123 + - 172.20.21.100:123 nginx_virthosts: - virthost_name: git.local.mrwho.ru @@ -47,6 +47,8 @@ # error_page: /path_to_error_page.html ssl_enabled: true ssl_only: true + nginx_ssl_cert_file: '/etc/letsencrypt/live/mrwho.ru/fullchain.pem' + nginx_ssl_cert_key: '/etc/letsencrypt/live/mrwho.ru/privkey.pem' # ssl_letsencrypt_certs: "{{ nginx_letsencrypt_managed }}" # root: "{{ nginx_webroot }}" server_tokens: "off" @@ -64,6 +66,8 @@ # error_page: /path_to_error_page.html ssl_enabled: true ssl_only: true + nginx_ssl_cert_file: '/etc/letsencrypt/live/mrwho.ru/fullchain.pem' + nginx_ssl_cert_key: '/etc/letsencrypt/live/mrwho.ru/privkey.pem' # ssl_letsencrypt_certs: "{{ nginx_letsencrypt_managed }}" # root: "{{ nginx_webroot }}" server_tokens: "off" @@ -74,6 +78,33 @@ - location: / target: "https://172.20.21.105:9443" + - virthost_name: kubernetes.local.mrwho.ru + server_name: kubernetes.local.mrwho.ru + ssl_enabled: true + ssl_only: true + nginx_ssl_cert_file: '/etc/letsencrypt/live/mrwho.ru/fullchain.pem' + nginx_ssl_cert_key: '/etc/letsencrypt/live/mrwho.ru/privkey.pem' + server_tokens: "off" + proxy_standard_setup: true + proxy_additional_options: + - proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache:30m max_size=250m; + locations: + - location: / + target: "https://172.20.21.201:10001" + + - virthost_name: longhorn.local.mrwho.ru + server_name: longhorn.local.mrwho.ru + ssl_enabled: true + ssl_only: true + nginx_ssl_cert_file: '/etc/letsencrypt/live/mrwho.ru/fullchain.pem' + nginx_ssl_cert_key: '/etc/letsencrypt/live/mrwho.ru/privkey.pem' + server_tokens: "off" + proxy_standard_setup: true + proxy_additional_options: + - proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache:30m max_size=250m; + locations: + - location: / + target: "https://172.20.21.201:10002" ###### Firewalld configuration ###### firewall: # - previous: replaced # flush previous rules