From a2c5295afdc5533377dc1d37447e93517b6d5878 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 19 Mar 2021 14:18:57 +0100 Subject: [PATCH 1/8] Create ejabberd-3 VM --- clients/ejabberd-3.json | 4 ++++ nodes/ejabberd-3.json | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 clients/ejabberd-3.json create mode 100644 nodes/ejabberd-3.json diff --git a/clients/ejabberd-3.json b/clients/ejabberd-3.json new file mode 100644 index 0000000..061b8d6 --- /dev/null +++ b/clients/ejabberd-3.json @@ -0,0 +1,4 @@ +{ + "name": "ejabberd-3", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA14PSaCOKMDIIBbSZcmRw\nvVx95IYJ7kZGUwo8xsVJyf4o1+oKKGfvsjVBacP4DxMJ/+g58Sc/j9risD2d5Ke9\nJ93BIaspPB3bQf+w84AVDJIqvRAhbmcYEqCq1vnddXiSw5ZWplTX4dAVV8P2c++i\nb0Ork2cj1x1r/FdAgHnhuSh4HMtWyo6Zo7Uh63kX9Ag4CTAV+OPF5ZSxyQTVdL2E\n/5gomouxgxME6bnE6PmS1Abls10UARe7btT5eykW/weEIe/mJ4MLEGyqWe5bmZt2\nF4aaYdCsCNA3f6hehcCegeMkPxuG/2oSyk2TKT2c3UuAELA15rGM353Dr1hxbZoe\nRQIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/ejabberd-3.json b/nodes/ejabberd-3.json new file mode 100644 index 0000000..9644195 --- /dev/null +++ b/nodes/ejabberd-3.json @@ -0,0 +1,52 @@ +{ + "name": "ejabberd-3", + "normal": { + "knife_zero": { + "host": "10.1.1.212" + } + }, + "automatic": { + "fqdn": "ejabberd-3", + "os": "linux", + "os_version": "5.4.0-1026-kvm", + "hostname": "ejabberd-3", + "ipaddress": "192.168.122.93", + "roles": [ + + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "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": { + "ohai": { + "version": "15.12.0", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" + }, + "chef": { + "version": "15.15.1", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib" + } + } + }, + "run_list": [ + "recipe[kosmos-base]" + ] +} \ No newline at end of file -- 2.25.1 From 14d83b43762fe21fb2c6ec1a57fe5312beb69df2 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Wed, 24 Mar 2021 15:29:10 +0100 Subject: [PATCH 2/8] Add ejabberd-4 VM --- clients/ejabberd-4.json | 4 ++++ nodes/ejabberd-4.json | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 clients/ejabberd-4.json create mode 100644 nodes/ejabberd-4.json diff --git a/clients/ejabberd-4.json b/clients/ejabberd-4.json new file mode 100644 index 0000000..14b1eaa --- /dev/null +++ b/clients/ejabberd-4.json @@ -0,0 +1,4 @@ +{ + "name": "ejabberd-4", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6FuI13W2sft83OIWe59/\nYTfpTfKcYTCq5zAQEu87OYHHQeBAYo0W/g/qICh3qw0ie2QMPyggAezoeR5VQdLt\nkJq1X9AHqyX59YThzj7dLCCEKq+mAdriuKzNGu8eml4DRM3m+xw7jFzcwwrD8ECZ\nY+Kn7bcOtozx0mXpEm+cO2cOKmRQn0VJwAQSe6eW301iGmpR9et4hDqMjhiUiwaU\nWAqpsmP/JQMLAX2gLzwilD63VCQlcQCDq/D1m/N6bWb1L47zNAzwOCSYV92bGNDe\nRe+4gCVVLpfGWKbkjQFDraCmME7+O50WpbfowylF8gOzgl3AvnpC/LOSzT8VtMPr\nZQIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json new file mode 100644 index 0000000..a0e516e --- /dev/null +++ b/nodes/ejabberd-4.json @@ -0,0 +1,52 @@ +{ + "name": "ejabberd-4", + "normal": { + "knife_zero": { + "host": "10.1.1.113" + } + }, + "automatic": { + "fqdn": "ejabberd-4", + "os": "linux", + "os_version": "5.4.0-1026-kvm", + "hostname": "ejabberd-4", + "ipaddress": "192.168.122.39", + "roles": [ + + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "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": { + "ohai": { + "version": "15.12.0", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" + }, + "chef": { + "version": "15.15.1", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib" + } + } + }, + "run_list": [ + "recipe[kosmos-base]" + ] +} \ No newline at end of file -- 2.25.1 From 024b4bf164183fad38b73f4c450fddcf8914b98c Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 10:33:04 -0600 Subject: [PATCH 3/8] Fix typo --- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index 20181b6..5e1cdb5 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -66,7 +66,7 @@ ruby_block "configure ERLANG_NODE" do file = Chef::Util::FileEdit.new("/opt/ejabberd/conf/ejabberdctl.cfg") file.search_file_replace_line( %r{#ERLANG_NODE=ejabberd@localhost}, - "ERLAND_NODE=#{node['kosmos-ejabberd']['erlang_node']}" + "ERLANG_NODE=#{node['kosmos-ejabberd']['erlang_node']}" ) file.write_file end -- 2.25.1 From 5b351036ba62d7b1ec9cf9ac19afece991de2f20 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 11:16:23 -0600 Subject: [PATCH 4/8] Remove superfluous license header --- .../kosmos-ejabberd/recipes/default.rb | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index 5e1cdb5..0c69d95 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -2,27 +2,6 @@ # Cookbook:: kosmos-ejabberd # Recipe:: default # -# The MIT License (MIT) -# -# Copyright:: 2019, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. ejabberd_credentials = data_bag_item("credentials", "ejabberd") -- 2.25.1 From 74dd59ad0701f95d0c148bb569cac3aa63fcb422 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 11:16:44 -0600 Subject: [PATCH 5/8] Write hostname-related configs for new ejabberd cluster --- site-cookbooks/kosmos-ejabberd/metadata.rb | 1 + .../kosmos-ejabberd/recipes/default.rb | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/metadata.rb b/site-cookbooks/kosmos-ejabberd/metadata.rb index 0131259..a47ac07 100644 --- a/site-cookbooks/kosmos-ejabberd/metadata.rb +++ b/site-cookbooks/kosmos-ejabberd/metadata.rb @@ -26,3 +26,4 @@ depends "kosmos_postgresql" depends "backup" depends "firewall" depends "tor-full" +depends "hostsfile" diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index 0c69d95..8ef2b26 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -29,15 +29,25 @@ file "/opt/ejabberd/.erlang.cookie" do content ejabberd_credentials['erlang_cookie'] end +ejabberd_nodes = search(:node, "role:ejabberd") + +ejabberd_nodes.each do |n| + ip_address = n["knife_zero"]["host"] + IPAddr.new ip_address + hostsfile_entry ip_address do + hostname n["hostname"] + action :create + end +rescue IPAddr::InvalidAddressError + next +end + +ejabberd_hostnames = ejabberd_nodes.map { |n| n["hostname"] } file "/opt/ejabberd/.hosts.erlang" do mode "0644" owner "ejabberd" group "ejabberd" - content <<-EOF -"andromeda.kosmos.org". -"centaurus.kosmos.org". -"draco.kosmos.org". - EOF + content ejabberd_hostnames.map{|h| "#{h}."}.join("\n") end ruby_block "configure ERLANG_NODE" do @@ -45,7 +55,7 @@ ruby_block "configure ERLANG_NODE" do file = Chef::Util::FileEdit.new("/opt/ejabberd/conf/ejabberdctl.cfg") file.search_file_replace_line( %r{#ERLANG_NODE=ejabberd@localhost}, - "ERLANG_NODE=#{node['kosmos-ejabberd']['erlang_node']}" + "ERLANG_NODE=ejabberd@#{node['name']}" ) file.write_file end -- 2.25.1 From 62c95175ccd7828cd24a19685214be549c3c56ef Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 11:23:57 -0600 Subject: [PATCH 6/8] Only allow ZeroTier connections for ejabberd cluster --- .../kosmos-ejabberd/recipes/firewall.rb | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/firewall.rb b/site-cookbooks/kosmos-ejabberd/recipes/firewall.rb index 5d2ac3a..968da9b 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/firewall.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/firewall.rb @@ -2,28 +2,6 @@ # Cookbook:: kosmos-ejabberd # Recipe:: firewall # -# The MIT License (MIT) -# -# Copyright:: 2020, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - include_recipe "kosmos-base::firewall" firewall_rule "ejabberd" do @@ -34,12 +12,14 @@ end firewall_rule 'ejabberd_cluster' do port [4369] + source "10.1.1.0/24" protocol :tcp command :allow end firewall_rule 'erlang_cluster' do port [4200..4210] + source "10.1.1.0/24" protocol :tcp command :allow end -- 2.25.1 From 58736f05ee6e8503af9658b5d1210aff112779db Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 11:51:37 -0600 Subject: [PATCH 7/8] Remove node configs for old ejabberd cluster --- clients/ejabberd-1.json | 4 --- clients/ejabberd-2.json | 4 --- nodes/ejabberd-1.json | 67 ----------------------------------------- nodes/ejabberd-2.json | 67 ----------------------------------------- 4 files changed, 142 deletions(-) delete mode 100644 clients/ejabberd-1.json delete mode 100644 clients/ejabberd-2.json delete mode 100644 nodes/ejabberd-1.json delete mode 100644 nodes/ejabberd-2.json diff --git a/clients/ejabberd-1.json b/clients/ejabberd-1.json deleted file mode 100644 index 1d6a89b..0000000 --- a/clients/ejabberd-1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ejabberd-1", - "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtoVmQAEmmAWjjzi5X8Ia\n9sl2aH8Lh0AsckM0aE3hvw9lGfbNCPpYWrr0uh7R6/+13Z0OghrT3yDAZ+XfH39Y\nuGomazTzSMMOEofjepo+nXSgq4meFfX5vobYG7rpBdz1EsIT1bElHduItA2zsw9J\nFpXtGd4BjumMq1VykSTA+QaEE8byes/+groQTtXPqXf5gJMxyGlh4SU0MzmkGHaW\n8c9BPCQrV0CMiuGOGJ5mZ28HajbvSg3+bpgwThh3M5uQaQ6on1N2pvJuBypUySS6\nyc4TauocUcUsULYXq9wM8/rqDYsUah0PR0WSiOi90m5thGeBchFAmhdCvrS34FlR\nVQIDAQAB\n-----END PUBLIC KEY-----\n" -} \ No newline at end of file diff --git a/clients/ejabberd-2.json b/clients/ejabberd-2.json deleted file mode 100644 index 1d3e5f3..0000000 --- a/clients/ejabberd-2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ejabberd-2", - "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAudueTsPYnRXRu/rmMGZe\nI7LdyrWKdY9FJaRhkXR5J9Yb8QnIcDS7ZXDJsVhyQW8pZ2DuaIs5dmGYvRtmx0ol\nqHTEel01Q3/xI1blJoq4uRm639PB5M9dSJ0w+s6P5zj7rbFKpvMBYxBSK6z+gXIc\n/L1ayJ6JOssX5/tEvcvx/d4GIxof/Q+puACAXawx7W88Wl7yYWdBQ78uTPHzuMyB\n8BRYz24tki/O1fa9JijW32d3EELD0EccI3iJ+/CR4BFEEM2QdDczY/Q6Ny7h7inH\n/TdU246nvtJIx7bAZHmDIDva8YPtL27RIOQ3JqBBe7prQP5Q9MBGPyCXWAglj99a\n6QIDAQAB\n-----END PUBLIC KEY-----\n" -} \ No newline at end of file diff --git a/nodes/ejabberd-1.json b/nodes/ejabberd-1.json deleted file mode 100644 index ade9b42..0000000 --- a/nodes/ejabberd-1.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "ejabberd-1", - "normal": { - "knife_zero": { - "host": "10.1.1.166" - }, - "kosmos-ejabberd": { - "erlang_node": "ejabberd@draco.kosmos.org" - } - }, - "automatic": { - "fqdn": "ejabberd-1", - "os": "linux", - "os_version": "5.4.0-54-generic", - "hostname": "ejabberd-1", - "ipaddress": "192.168.122.62", - "roles": [ - "ejabberd", - "postgresql_client" - ], - "recipes": [ - "kosmos-base", - "kosmos-base::default", - "kosmos-postgresql::hostsfile", - "kosmos-ejabberd", - "kosmos-ejabberd::default", - "kosmos-ejabberd::letsencrypt", - "kosmos-ejabberd::backup", - "apt::default", - "timezone_iii::default", - "timezone_iii::debian", - "ntp::default", - "ntp::apparmor", - "kosmos-base::systemd_emails", - "apt::unattended-upgrades", - "kosmos-base::firewall", - "kosmos-postfix::default", - "postfix::default", - "postfix::_common", - "postfix::_attributes", - "postfix::sasl_auth", - "hostname::default", - "kosmos-ejabberd::firewall", - "tor-full::default", - "kosmos-base::letsencrypt", - "backup::default", - "logrotate::default" - ], - "platform": "ubuntu", - "platform_version": "20.04", - "cloud": null, - "chef_packages": { - "chef": { - "version": "15.14.0", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib" - }, - "ohai": { - "version": "15.12.0", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" - } - } - }, - "run_list": [ - "recipe[kosmos-base]", - "role[ejabberd]" - ] -} diff --git a/nodes/ejabberd-2.json b/nodes/ejabberd-2.json deleted file mode 100644 index cbb250b..0000000 --- a/nodes/ejabberd-2.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "ejabberd-2", - "normal": { - "knife_zero": { - "host": "10.1.1.44" - }, - "kosmos-ejabberd": { - "erlang_node": "ejabberd@centaurus.kosmos.org" - } - }, - "automatic": { - "fqdn": "ejabberd-2", - "os": "linux", - "os_version": "5.4.0-54-generic", - "hostname": "ejabberd-2", - "ipaddress": "192.168.122.5", - "roles": [ - "ejabberd", - "postgresql_client" - ], - "recipes": [ - "kosmos-base", - "kosmos-base::default", - "kosmos-postgresql::hostsfile", - "kosmos-ejabberd", - "kosmos-ejabberd::default", - "kosmos-ejabberd::letsencrypt", - "kosmos-ejabberd::backup", - "apt::default", - "timezone_iii::default", - "timezone_iii::debian", - "ntp::default", - "ntp::apparmor", - "kosmos-base::systemd_emails", - "apt::unattended-upgrades", - "kosmos-base::firewall", - "kosmos-postfix::default", - "postfix::default", - "postfix::_common", - "postfix::_attributes", - "postfix::sasl_auth", - "hostname::default", - "kosmos-ejabberd::firewall", - "tor-full::default", - "kosmos-base::letsencrypt", - "backup::default", - "logrotate::default" - ], - "platform": "ubuntu", - "platform_version": "20.04", - "cloud": null, - "chef_packages": { - "chef": { - "version": "15.14.0", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib" - }, - "ohai": { - "version": "15.12.0", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" - } - } - }, - "run_list": [ - "recipe[kosmos-base]", - "role[ejabberd]" - ] -} -- 2.25.1 From 6c8a98c52412b102210dc2aac0543e725aa6d625 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 18 Jan 2022 12:28:56 -0600 Subject: [PATCH 8/8] Run Chef with ejabberd role against new cluster nodes --- nodes/ejabberd-3.json | 33 +++++++++++++++++++++++---------- nodes/ejabberd-4.json | 33 +++++++++++++++++++++++---------- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/nodes/ejabberd-3.json b/nodes/ejabberd-3.json index 9644195..8733ff7 100644 --- a/nodes/ejabberd-3.json +++ b/nodes/ejabberd-3.json @@ -8,15 +8,21 @@ "automatic": { "fqdn": "ejabberd-3", "os": "linux", - "os_version": "5.4.0-1026-kvm", + "os_version": "5.4.0-1051-kvm", "hostname": "ejabberd-3", "ipaddress": "192.168.122.93", "roles": [ - + "ejabberd", + "postgresql_client" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_postgresql::hostsfile", + "kosmos-ejabberd", + "kosmos-ejabberd::default", + "kosmos-ejabberd::letsencrypt", + "kosmos-ejabberd::backup", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -30,23 +36,30 @@ "postfix::_common", "postfix::_attributes", "postfix::sasl_auth", - "hostname::default" + "hostname::default", + "kosmos-ejabberd::firewall", + "tor-full::default", + "kosmos-base::letsencrypt", + "backup::default", + "logrotate::default" ], "platform": "ubuntu", "platform_version": "20.04", "cloud": null, "chef_packages": { - "ohai": { - "version": "15.12.0", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" - }, "chef": { - "version": "15.15.1", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib" + "version": "17.9.26", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.26/lib", + "chef_effortless": null + }, + "ohai": { + "version": "17.9.1", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.1/lib/ohai" } } }, "run_list": [ - "recipe[kosmos-base]" + "recipe[kosmos-base]", + "role[ejabberd]" ] } \ No newline at end of file diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json index a0e516e..2fbc4d9 100644 --- a/nodes/ejabberd-4.json +++ b/nodes/ejabberd-4.json @@ -8,15 +8,21 @@ "automatic": { "fqdn": "ejabberd-4", "os": "linux", - "os_version": "5.4.0-1026-kvm", + "os_version": "5.4.0-1051-kvm", "hostname": "ejabberd-4", "ipaddress": "192.168.122.39", "roles": [ - + "ejabberd", + "postgresql_client" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_postgresql::hostsfile", + "kosmos-ejabberd", + "kosmos-ejabberd::default", + "kosmos-ejabberd::letsencrypt", + "kosmos-ejabberd::backup", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -30,23 +36,30 @@ "postfix::_common", "postfix::_attributes", "postfix::sasl_auth", - "hostname::default" + "hostname::default", + "kosmos-ejabberd::firewall", + "tor-full::default", + "kosmos-base::letsencrypt", + "backup::default", + "logrotate::default" ], "platform": "ubuntu", "platform_version": "20.04", "cloud": null, "chef_packages": { - "ohai": { - "version": "15.12.0", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai" - }, "chef": { - "version": "15.15.1", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib" + "version": "17.9.26", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.26/lib", + "chef_effortless": null + }, + "ohai": { + "version": "17.9.1", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.1/lib/ohai" } } }, "run_list": [ - "recipe[kosmos-base]" + "recipe[kosmos-base]", + "role[ejabberd]" ] } \ No newline at end of file -- 2.25.1