diff --git a/nodes/rsk-testnet-2.json b/nodes/rsk-testnet-2.json index 770fb70..4258baf 100644 --- a/nodes/rsk-testnet-2.json +++ b/nodes/rsk-testnet-2.json @@ -12,12 +12,13 @@ "hostname": "rsk-testnet-2", "ipaddress": "192.168.122.29", "roles": [ - "rsk_testnet" + "rskj_testnet" ], "recipes": [ "kosmos-base", "kosmos-base::default", "kosmos_rsk::rskj", + "kosmos_rsk::nginx", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -34,7 +35,18 @@ "hostname::default", "kosmos_rsk::firewall", "firewall::default", - "chef-sugar::default" + "chef-sugar::default", + "kosmos-nginx::default", + "nginx::default", + "nginx::package", + "nginx::ohai_plugin", + "nginx::repo", + "nginx::commons", + "nginx::commons_dir", + "nginx::commons_script", + "nginx::commons_conf", + "kosmos-nginx::firewall", + "kosmos-base::letsencrypt" ], "platform": "ubuntu", "platform_version": "20.04", @@ -55,4 +67,4 @@ "recipe[kosmos-base]", "role[rskj_testnet]" ] -} +} \ No newline at end of file diff --git a/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb b/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb index 4863646..7a4cbd5 100644 --- a/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb +++ b/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb @@ -12,12 +12,8 @@ server { access_log <%= node[:nginx][:log_dir] %>/<%= @domain %>.access.log json; error_log <%= node[:nginx][:log_dir] %>/<%= @domain %>.error.log warn; - root <%= @root_dir %>; - location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_redirect off; proxy_pass localhost:<%= @port %>;