Migrate RSK proxies to openresty

This commit is contained in:
Râu Cao 2023-07-26 14:08:44 +02:00
parent 53abc2ec9a
commit 4d528d67ef
Signed by: raucao
GPG Key ID: 15E65F399D084BA9
4 changed files with 11 additions and 15 deletions

View File

@ -41,6 +41,8 @@
"kosmos-akkounts::nginx", "kosmos-akkounts::nginx",
"kosmos_discourse::nginx", "kosmos_discourse::nginx",
"kosmos_drone::nginx", "kosmos_drone::nginx",
"kosmos_rsk::nginx_testnet",
"kosmos_rsk::nginx_mainnet",
"kosmos_encfs", "kosmos_encfs",
"kosmos_encfs::default", "kosmos_encfs::default",
"kosmos-ejabberd::firewall", "kosmos-ejabberd::firewall",

View File

@ -9,4 +9,4 @@ issues_url 'https://gitea.kosmos.org/kosmos/chef/issues'
source_url 'https://gitea.kosmos.org/kosmos/chef' source_url 'https://gitea.kosmos.org/kosmos/chef'
depends 'firewall' depends 'firewall'
depends 'kosmos-nginx' depends 'kosmos_openresty'

View File

@ -5,33 +5,27 @@ property :network, String, required: true, name_property: true
property :domain, String, required: true property :domain, String, required: true
action :create do action :create do
include_recipe "kosmos-nginx"
network = new_resource.network network = new_resource.network
domain = new_resource.domain domain = new_resource.domain
nginx_certbot_site domain
upstream_hosts = [] upstream_hosts = []
search(:node, "role:rskj_#{network}").each do |node| search(:node, "role:rskj_#{network}").each do |node|
upstream_hosts << node["knife_zero"]["host"] upstream_hosts << node["knife_zero"]["host"]
end end
upstream_hosts.push("localhost") if upstream_hosts.empty? upstream_hosts.push("localhost") if upstream_hosts.empty?
template "#{node['nginx']['dir']}/sites-available/#{domain}" do tls_cert_for domain do
source "nginx_conf_rskj.erb" auth "gandi_dns"
owner 'www-data' action :create
mode 0640 end
openresty_site domain do
template "nginx_conf_rskj.erb"
variables domain: domain, variables domain: domain,
upstream_name: "rskj_#{network}", upstream_name: "rskj_#{network}",
upstream_hosts: upstream_hosts, upstream_hosts: upstream_hosts,
upstream_port: "4444", upstream_port: "4444",
ssl_cert: "/etc/letsencrypt/live/#{domain}/fullchain.pem", ssl_cert: "/etc/letsencrypt/live/#{domain}/fullchain.pem",
ssl_key: "/etc/letsencrypt/live/#{domain}/privkey.pem" ssl_key: "/etc/letsencrypt/live/#{domain}/privkey.pem"
notifies :reload, 'service[nginx]', :delayed
end
nginx_site domain do
action :enable
end end
end end

View File

@ -5,7 +5,7 @@ upstream _<%= @upstream_name %> {
} }
server { server {
listen 443 ssl http2; listen <%= "#{node['openresty']['listen_ip']}:" if node['openresty']['listen_ip'] %>443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
server_name <%= @domain %>; server_name <%= @domain %>;