From 584da20d3ef9d53aa9f69a8899546d5b27636aee Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Mon, 29 Nov 2021 13:55:04 -0600
Subject: [PATCH] Deploy nginx reverse proxy for RSK mainnet

---
 nodes/rsk-mainnet-1.json                      | 19 ++++++++++++++++---
 roles/rsk_mainnet.rb                          | 11 -----------
 roles/rskj_mainnet.rb                         | 19 +++++++++++++++++++
 .../kosmos_rsk/templates/nginx_conf_rskj.erb  |  2 +-
 4 files changed, 36 insertions(+), 15 deletions(-)
 delete mode 100644 roles/rsk_mainnet.rb
 create mode 100644 roles/rskj_mainnet.rb

diff --git a/nodes/rsk-mainnet-1.json b/nodes/rsk-mainnet-1.json
index efc92a3..1509a4c 100644
--- a/nodes/rsk-mainnet-1.json
+++ b/nodes/rsk-mainnet-1.json
@@ -12,12 +12,13 @@
     "hostname": "rsk-mainnet-1",
     "ipaddress": "192.168.122.233",
     "roles": [
-      "rsk_mainnet"
+      "rskj_mainnet"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
       "kosmos_rsk::rskj",
+      "kosmos_rsk::nginx",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
@@ -32,8 +33,20 @@
       "postfix::_attributes",
       "postfix::sasl_auth",
       "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",
@@ -52,6 +65,6 @@
   },
   "run_list": [
     "recipe[kosmos-base]",
-    "role[rsk_mainnet]"
+    "role[rskj_mainnet]"
   ]
 }
\ No newline at end of file
diff --git a/roles/rsk_mainnet.rb b/roles/rsk_mainnet.rb
deleted file mode 100644
index cfa58c1..0000000
--- a/roles/rsk_mainnet.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-name "rsk_mainnet"
-
-run_list %w(
-  kosmos_rsk::rskj
-)
-
-override_attributes(
-  :rskj => {
-    :network => "mainnet"
-  }
-)
diff --git a/roles/rskj_mainnet.rb b/roles/rskj_mainnet.rb
new file mode 100644
index 0000000..0a0d9e1
--- /dev/null
+++ b/roles/rskj_mainnet.rb
@@ -0,0 +1,19 @@
+name 'rskj_mainnet'
+
+default_attributes 'rskj' => {
+  'network' => 'mainnet',
+  'nginx' => {
+    'domain' => 'rsk.kosmos.org'
+  }
+}
+
+default_run_list = %w(
+  kosmos_rsk::rskj
+  kosmos_rsk::nginx
+)
+
+env_run_lists(
+  '_default' => default_run_list,
+  'development' => default_run_list,
+  'production' => default_run_list
+)
diff --git a/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb b/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb
index 7a4cbd5..0c18d52 100644
--- a/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb
+++ b/site-cookbooks/kosmos_rsk/templates/nginx_conf_rskj.erb
@@ -16,7 +16,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_redirect off;
-    proxy_pass localhost:<%= @port %>;
+    proxy_pass http://localhost:<%= @port %>;
    }
 }
 <% end -%>