From cbf42b9414ba00548272d41be17d3c08ab4a69a1 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 29 Nov 2021 11:23:17 -0600 Subject: [PATCH 1/2] Add node config for fornax --- nodes/fornax.kosmos.org.json | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 nodes/fornax.kosmos.org.json diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json new file mode 100644 index 0000000..853710e --- /dev/null +++ b/nodes/fornax.kosmos.org.json @@ -0,0 +1,54 @@ +{ + "name": "fornax.kosmos.org", + "normal": { + "knife_zero": { + "host": "fornax.kosmos.org" + } + }, + "automatic": { + "fqdn": "fornax.kosmos.org", + "os": "linux", + "os_version": "5.4.0-88-generic", + "hostname": "fornax", + "ipaddress": "148.251.83.201", + "roles": [ + + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::host", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "kosmos-base::systemd_emails", + "apt::unattended-upgrades", + "kosmos-base::firewall", + "kosmos-postfix::default", + "postfix::default", + "postfix::_common", + "postfix::_attributes", + "postfix::sasl_auth", + "hostname::default" + ], + "platform": "ubuntu", + "platform_version": "20.04", + "cloud": null, + "chef_packages": { + "chef": { + "version": "17.5.22", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.5.22/lib", + "chef_effortless": null + }, + "ohai": { + "version": "17.5.2", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.5.2/lib/ohai" + } + } + }, + "run_list": [ + "recipe[kosmos-base]", + "recipe[kosmos_kvm::host]" + ] +} \ No newline at end of file From fa8cbac16382525647f30539f8e1ede2fc3b75b5 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 29 Nov 2021 13:01:06 -0600 Subject: [PATCH 2/2] Fix custom resource not found in newer Chef versions fixes #361 refs #337 --- site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb index 9d9c0b6..8dc974e 100644 --- a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb +++ b/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb @@ -1,4 +1,5 @@ resource_name :nginx_certbot_site +provides :nginx_certbot_site property :domain, String, name_property: true # pass it if the site name is not the same as the hostname, for example for the