From 9c34e824849ed0aa0b8266862f84c90e99286726 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Thu, 17 Mar 2022 13:02:56 -0600 Subject: [PATCH] Remove obsolete hosts entries for Gitea and Drone They should use normal DNS --- site-cookbooks/kosmos_drone/recipes/default.rb | 15 --------------- site-cookbooks/kosmos_gitea/recipes/default.rb | 10 ---------- 2 files changed, 25 deletions(-) diff --git a/site-cookbooks/kosmos_drone/recipes/default.rb b/site-cookbooks/kosmos_drone/recipes/default.rb index 8df676f..1eec1d2 100644 --- a/site-cookbooks/kosmos_drone/recipes/default.rb +++ b/site-cookbooks/kosmos_drone/recipes/default.rb @@ -55,21 +55,6 @@ systemd_unit "drone.service" do action [:create, :enable, :start] end -nginx_proxy_ip_addresses = [] -search(:node, "role:nginx_proxy").each do |node| - nginx_proxy_ip_addresses << node["knife_zero"]["host"] -end - -nginx_proxy_ip_addresses.each do |ip_address| - IPAddr.new ip_address - hostsfile_entry ip_address do - hostname 'gitea.kosmos.org' - action :create - end -rescue IPAddr::InvalidAddressError - next -end - firewall_rule 'drone' do port [node["kosmos_drone"]["upstream_port"]] source "10.1.1.0/24" # TODO only allow nginx proxy IPs diff --git a/site-cookbooks/kosmos_gitea/recipes/default.rb b/site-cookbooks/kosmos_gitea/recipes/default.rb index 3b4a621..9d334ef 100644 --- a/site-cookbooks/kosmos_gitea/recipes/default.rb +++ b/site-cookbooks/kosmos_gitea/recipes/default.rb @@ -71,16 +71,6 @@ node.default["kosmos_gitea"]["config"] = { } } -nginx_proxy_ip_addresses.each do |ip_address| - IPAddr.new ip_address - hostsfile_entry ip_address do - hostname 'drone.kosmos.org' - action :create - end -rescue IPAddr::InvalidAddressError - next -end - template "#{config_directory}/app.ini" do source "app.ini.erb" owner "git"