From d5e3d625220549bb546b292226c64cc912d0e8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Sat, 11 Apr 2026 15:22:34 +0400 Subject: [PATCH] Add new postgres cluster, remove old one --- clients/postgres-11.json | 4 ++ clients/postgres-12.json | 4 ++ nodes/{postgres-6.json => postgres-11.json} | 27 +++++---- nodes/{postgres-10.json => postgres-12.json} | 13 ++-- nodes/postgres-8.json | 62 ------------------- nodes/postgres-9.json | 63 -------------------- 6 files changed, 30 insertions(+), 143 deletions(-) create mode 100644 clients/postgres-11.json create mode 100644 clients/postgres-12.json rename nodes/{postgres-6.json => postgres-11.json} (74%) rename nodes/{postgres-10.json => postgres-12.json} (85%) delete mode 100644 nodes/postgres-8.json delete mode 100644 nodes/postgres-9.json diff --git a/clients/postgres-11.json b/clients/postgres-11.json new file mode 100644 index 0000000..8ded2ba --- /dev/null +++ b/clients/postgres-11.json @@ -0,0 +1,4 @@ +{ + "name": "postgres-11", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1foYpuubS2ovlg3uHO12\nQ/ROZ8MpG+LkCAM46uVfPaoWwfY0vdfMsBOanHDgm9DGUCEBJZ6LPrvCvGXbpPy6\n9GSswK75zVWODblNjvvV4ueGFq4bBFwRuZNjyMlqgyzeU+srZL0ivelu5XEuGuoD\nPYCBKWYqGMz85/eMC7/tinTJtKPyOtXe/G8meji+r7gh3j+ypj/EWeKfcRDa4aGe\n/DmMCurIjjPAXFLMAA6fIqPWVfcPw4APNPE60Z92yPGsTbPu7bL54M5f7udmmu7H\nOgk1HjMAmXCuLDzTkfaxqHP+57yELg/YpXR1E93VmBeQuIBsyOFEk6AmUmA1Ib6e\nnQIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/clients/postgres-12.json b/clients/postgres-12.json new file mode 100644 index 0000000..2ac32cd --- /dev/null +++ b/clients/postgres-12.json @@ -0,0 +1,4 @@ +{ + "name": "postgres-12", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1mYGrYB8keUKmXA8dhWc\ncCLzp50xR0ajSw+bWYydyRqD5wuEVKjiJu4+G9QmTVXkVgJ+AYI0Y9/WZYpDqVH6\nvLUo6BSNQaWx20q93qIdOGLy8YG3Qyznezk4l8T9u9vWZDyDpKw6gCxzikMkrXxb\n0cqOYtyud8+PtSEEMogSjOKhRURVHlVrlVH3SQO7Whke9rkiFcbXzubsK9yjkUtF\nxZafSoGorOlDsPvFTfYnkepVB+GHcgiribRYSrO+73GypC2kqMhCpWrb6a0VWsP/\nh53+q3JL3vBvdvjcv51Wpf4n6JdnXnQGn2/MdXEzw+NXgjU4/IdYtbORSbaI8F5t\nowIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/postgres-6.json b/nodes/postgres-11.json similarity index 74% rename from nodes/postgres-6.json rename to nodes/postgres-11.json index 59d1cdc..a01909f 100644 --- a/nodes/postgres-6.json +++ b/nodes/postgres-11.json @@ -1,16 +1,17 @@ { - "name": "postgres-6", + "name": "postgres-11", + "chef_environment": "production", "normal": { "knife_zero": { - "host": "10.1.1.196" + "host": "10.1.1.91" } }, "automatic": { - "fqdn": "postgres-6", + "fqdn": "postgres-11", "os": "linux", - "os_version": "5.4.0-173-generic", - "hostname": "postgres-6", - "ipaddress": "192.168.122.60", + "os_version": "5.15.0-1095-kvm", + "hostname": "postgres-11", + "ipaddress": "192.168.122.142", "roles": [ "base", "kvm_guest", @@ -21,18 +22,20 @@ "kosmos-base::default", "kosmos_kvm::guest", "kosmos_postgresql::primary", - "kosmos_postgresql::firewall", "kosmos-akkounts::pg_db", "kosmos-bitcoin::lndhub-go_pg_db", "kosmos-bitcoin::nbxplorer_pg_db", "kosmos_drone::pg_db", "kosmos_gitea::pg_db", "kosmos-mastodon::pg_db", + "kosmos_postgresql::firewall", + "kosmos_postgresql::management_scripts", "apt::default", "timezone_iii::default", "timezone_iii::debian", "ntp::default", "ntp::apparmor", + "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", "kosmos-base::firewall", @@ -44,17 +47,17 @@ "hostname::default" ], "platform": "ubuntu", - "platform_version": "20.04", + "platform_version": "22.04", "cloud": null, "chef_packages": { "chef": { - "version": "18.4.2", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.4.2/lib", + "version": "18.10.17", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib", "chef_effortless": null }, "ohai": { - "version": "18.1.11", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.11/lib/ohai" + "version": "18.2.13", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai" } } }, diff --git a/nodes/postgres-10.json b/nodes/postgres-12.json similarity index 85% rename from nodes/postgres-10.json rename to nodes/postgres-12.json index 73cde74..d2359b2 100644 --- a/nodes/postgres-10.json +++ b/nodes/postgres-12.json @@ -1,17 +1,17 @@ { - "name": "postgres-10", + "name": "postgres-12", "chef_environment": "production", "normal": { "knife_zero": { - "host": "10.1.1.176" + "host": "10.1.1.134" } }, "automatic": { - "fqdn": "postgres-10", + "fqdn": "postgres-12", "os": "linux", - "os_version": "5.15.0-1095-kvm", - "hostname": "postgres-10", - "ipaddress": "192.168.122.41", + "os_version": "5.15.0-1096-kvm", + "hostname": "postgres-12", + "ipaddress": "192.168.122.139", "roles": [ "base", "kvm_guest", @@ -24,6 +24,7 @@ "kosmos_postgresql::hostsfile", "kosmos_postgresql::replica", "kosmos_postgresql::firewall", + "kosmos_postgresql::management_scripts", "apt::default", "timezone_iii::default", "timezone_iii::debian", diff --git a/nodes/postgres-8.json b/nodes/postgres-8.json deleted file mode 100644 index 82d4395..0000000 --- a/nodes/postgres-8.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "postgres-8", - "chef_environment": "production", - "normal": { - "knife_zero": { - "host": "10.1.1.99" - } - }, - "automatic": { - "fqdn": "postgres-8", - "os": "linux", - "os_version": "5.15.0-1059-kvm", - "hostname": "postgres-8", - "ipaddress": "192.168.122.100", - "roles": [ - "base", - "kvm_guest", - "postgresql_replica" - ], - "recipes": [ - "kosmos-base", - "kosmos-base::default", - "kosmos_kvm::guest", - "kosmos_postgresql::hostsfile", - "kosmos_postgresql::replica", - "kosmos_postgresql::firewall", - "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": "22.04", - "cloud": null, - "chef_packages": { - "chef": { - "version": "18.5.0", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.5.0/lib", - "chef_effortless": null - }, - "ohai": { - "version": "18.1.11", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.11/lib/ohai" - } - } - }, - "run_list": [ - "role[base]", - "role[kvm_guest]", - "role[postgresql_replica]" - ] -} diff --git a/nodes/postgres-9.json b/nodes/postgres-9.json deleted file mode 100644 index 529052f..0000000 --- a/nodes/postgres-9.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "name": "postgres-9", - "chef_environment": "production", - "normal": { - "knife_zero": { - "host": "10.1.1.3" - } - }, - "automatic": { - "fqdn": "postgres-9", - "os": "linux", - "os_version": "5.15.0-1059-kvm", - "hostname": "postgres-9", - "ipaddress": "192.168.122.64", - "roles": [ - "base", - "kvm_guest", - "postgresql_replica" - ], - "recipes": [ - "kosmos-base", - "kosmos-base::default", - "kosmos_kvm::guest", - "kosmos_postgresql::hostsfile", - "kosmos_postgresql::replica", - "kosmos_postgresql::firewall", - "apt::default", - "timezone_iii::default", - "timezone_iii::debian", - "ntp::default", - "ntp::apparmor", - "kosmos-base::journald_conf", - "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": "22.04", - "cloud": null, - "chef_packages": { - "chef": { - "version": "18.8.54", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.8.54/lib", - "chef_effortless": null - }, - "ohai": { - "version": "18.2.8", - "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.8/lib/ohai" - } - } - }, - "run_list": [ - "role[base]", - "role[kvm_guest]", - "role[postgresql_replica]" - ] -}