From 05dbf5211f6e8f397843c14597e410d5e4da0898 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sun, 23 Jan 2022 12:15:04 -0600 Subject: [PATCH 1/2] Remove old ejabberd node --- clients/ejabberd-3.json | 4 --- nodes/ejabberd-3.json | 65 ----------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 clients/ejabberd-3.json delete mode 100644 nodes/ejabberd-3.json diff --git a/clients/ejabberd-3.json b/clients/ejabberd-3.json deleted file mode 100644 index 061b8d6..0000000 --- a/clients/ejabberd-3.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "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 deleted file mode 100644 index 8733ff7..0000000 --- a/nodes/ejabberd-3.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "ejabberd-3", - "normal": { - "knife_zero": { - "host": "10.1.1.212" - } - }, - "automatic": { - "fqdn": "ejabberd-3", - "os": "linux", - "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", - "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": "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]", - "role[ejabberd]" - ] -} \ No newline at end of file -- 2.25.1 From 8509e0af58177b2f990cc8701c0aec109df3c3c2 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sun, 23 Jan 2022 12:15:14 -0600 Subject: [PATCH 2/2] Add new ejabberd node --- clients/ejabberd-6.json | 4 +++ nodes/ejabberd-6.json | 65 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 clients/ejabberd-6.json create mode 100644 nodes/ejabberd-6.json diff --git a/clients/ejabberd-6.json b/clients/ejabberd-6.json new file mode 100644 index 0000000..9b170e1 --- /dev/null +++ b/clients/ejabberd-6.json @@ -0,0 +1,4 @@ +{ + "name": "ejabberd-6", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvGOanDqJOhf0xl/TYcs\nqYhhGz4ptFzxmfxiCMWbnbDcICBLHni28dJHhP2ggfUKOGcp+OIqiy783eRUrPsf\nnH9VmvTnz4NdXIB5J45FgBtfYiF9ZseaPL+ufTSCbZj7Ih3lzTAbO5Ug+UOj852B\nnnqH2Ht2jXMp2v3NW4gAG9QyRpr6P5cyVWBrMFExjuhNWg119tJv+33oGnflrNRi\njV3yGbRFRpqAomAVCr6DAA9SX/R8J3yKTky6MdRGrXKH/7eXH0ehDi33Y9Pyy9Ci\nkQX/JRHffuJeBF3Tndiojqdx81C6oIh2s/H3JMew/DdRxjzlPP4nemYWXv1/YVcS\nCwIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/ejabberd-6.json b/nodes/ejabberd-6.json new file mode 100644 index 0000000..5e61d4a --- /dev/null +++ b/nodes/ejabberd-6.json @@ -0,0 +1,65 @@ +{ + "name": "ejabberd-6", + "normal": { + "knife_zero": { + "host": "10.1.1.145" + } + }, + "automatic": { + "fqdn": "ejabberd-6", + "os": "linux", + "os_version": "5.4.0-1049-kvm", + "hostname": "ejabberd-6", + "ipaddress": "192.168.122.248", + "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": "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]", + "role[ejabberd]" + ] +} \ No newline at end of file -- 2.25.1