From 1afc860b21d9603b3a13c690f497cbcca27fac63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kip.pe>
Date: Tue, 11 Apr 2023 12:14:17 +0200
Subject: [PATCH] Fix Gitea Actions runner not working with private host

---
 nodes/gitea-2.json                                |  2 +-
 site-cookbooks/kosmos_gitea/attributes/default.rb |  2 +-
 site-cookbooks/kosmos_gitea/recipes/act_runner.rb | 10 ++--------
 site-cookbooks/kosmos_gitea/recipes/nginx.rb      |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json
index c654795..8645d96 100644
--- a/nodes/gitea-2.json
+++ b/nodes/gitea-2.json
@@ -9,7 +9,7 @@
   "automatic": {
     "fqdn": "gitea-2",
     "os": "linux",
-    "os_version": "5.4.0-1076-kvm",
+    "os_version": "5.4.0-1088-kvm",
     "hostname": "gitea-2",
     "ipaddress": "192.168.122.189",
     "roles": [
diff --git a/site-cookbooks/kosmos_gitea/attributes/default.rb b/site-cookbooks/kosmos_gitea/attributes/default.rb
index 900ab52..6ecfddf 100644
--- a/site-cookbooks/kosmos_gitea/attributes/default.rb
+++ b/site-cookbooks/kosmos_gitea/attributes/default.rb
@@ -5,7 +5,7 @@ node.default["gitea"]["binary_checksum"] = "51e8d46a2634e5b5f4266eee8ca4689b5932
 node.default["gitea"]["working_directory"] = "/var/lib/gitea"
 node.default["gitea"]["port"] = 3000
 node.default["gitea"]["postgresql_host"] = "localhost:5432"
-node.default["gitea"]["nginx"]["domain"] = "gitea.kosmos.org"
+node.default["gitea"]["domain"] = "gitea.kosmos.org"
 
 node.default["gitea"]["config"] = {
   "actions": {
diff --git a/site-cookbooks/kosmos_gitea/recipes/act_runner.rb b/site-cookbooks/kosmos_gitea/recipes/act_runner.rb
index 46c4158..e34382e 100644
--- a/site-cookbooks/kosmos_gitea/recipes/act_runner.rb
+++ b/site-cookbooks/kosmos_gitea/recipes/act_runner.rb
@@ -6,13 +6,7 @@
 working_directory = node["gitea"]["working_directory"]
 gitea_credentials = data_bag_item("credentials", "gitea")
 runners           = gitea_credentials["runners"]
-
-begin
-  gitea_host = search(:node, "role:gitea").first["knife_zero"]["host"]
-rescue
-  Chef::Log.warn('No server with "gitea" role. Stopping here.')
-  return
-end
+gitea_host        = "https://#{node["gitea"]["domain"]}"
 
 apt_repository 'docker' do
   uri 'https://download.docker.com/linux/ubuntu'
@@ -52,7 +46,7 @@ runners.each do |runner|
     code <<-EOF
 act_runner register \
   --no-interactive \
-  --instance http://#{gitea_host}:#{node["gitea"]["port"]} \
+  --instance #{gitea_host} \
   --name #{runner_name} \
   --token #{runner["token"]}
     EOF
diff --git a/site-cookbooks/kosmos_gitea/recipes/nginx.rb b/site-cookbooks/kosmos_gitea/recipes/nginx.rb
index e145676..1af4c5a 100644
--- a/site-cookbooks/kosmos_gitea/recipes/nginx.rb
+++ b/site-cookbooks/kosmos_gitea/recipes/nginx.rb
@@ -5,7 +5,7 @@
 
 include_recipe "kosmos-nginx"
 
-domain = node["gitea"]["nginx"]["domain"]
+domain = node["gitea"]["domain"]
 
 # upstream_ip_addresses = []
 # search(:node, "role:gitea").each do |n|