diff --git a/nodes/discourse-2.json b/nodes/discourse-2.json index 8db4677..5f16686 100644 --- a/nodes/discourse-2.json +++ b/nodes/discourse-2.json @@ -12,13 +12,16 @@ "hostname": "discourse-2", "ipaddress": "192.168.122.104", "roles": [ - "discourse" + "kosmos_discourse", + "kvm_guest" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos-dirsrv::hostsfile", "kosmos_discourse", "kosmos_discourse::default", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -33,7 +36,7 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", - "kosmos-dirsrv::hostsfile", + "discourse::default", "firewall::default", "chef-sugar::default" ], @@ -54,6 +57,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[kosmos_discourse]" ] } diff --git a/nodes/drone-1.json b/nodes/drone-1.json index 5ad5474..daa2016 100644 --- a/nodes/drone-1.json +++ b/nodes/drone-1.json @@ -13,7 +13,8 @@ "ipaddress": "192.168.122.200", "roles": [ "drone", - "postgresql_client" + "postgresql_client", + "kvm_guest" ], "recipes": [ "kosmos-base", @@ -21,6 +22,7 @@ "kosmos_postgresql::hostsfile", "kosmos_drone", "kosmos_drone::default", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -53,6 +55,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[drone]" ] -} \ No newline at end of file +} diff --git a/nodes/ejabberd-8.json b/nodes/ejabberd-8.json index 9ebc158..71c7504 100644 --- a/nodes/ejabberd-8.json +++ b/nodes/ejabberd-8.json @@ -58,6 +58,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[ejabberd]" ] -} \ No newline at end of file +} diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json index bbd1f0e..d9c4aa0 100644 --- a/nodes/fornax.kosmos.org.json +++ b/nodes/fornax.kosmos.org.json @@ -19,6 +19,7 @@ "kosmos-base", "kosmos-base::default", "kosmos_kvm::host", + "kosmos_kvm::backup", "kosmos_assets::nginx_site", "kosmos_discourse::nginx", "kosmos_drone::nginx", @@ -77,6 +78,7 @@ "run_list": [ "recipe[kosmos-base]", "recipe[kosmos_kvm::host]", + "recipe[kosmos_kvm::backup]", "role[nginx_proxy]", "role[zerotier_controller]" ] diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json index ee569c7..acbfb42 100644 --- a/nodes/gitea-2.json +++ b/nodes/gitea-2.json @@ -13,7 +13,8 @@ "ipaddress": "192.168.122.189", "roles": [ "gitea", - "postgresql_client" + "postgresql_client", + "kvm_guest" ], "recipes": [ "kosmos-base", @@ -22,6 +23,7 @@ "kosmos_gitea", "kosmos_gitea::default", "kosmos_gitea::backup", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -57,6 +59,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[gitea]" ] -} \ No newline at end of file +} diff --git a/nodes/jitsi-meet-1.json b/nodes/jitsi-meet-1.json new file mode 100644 index 0000000..76eff64 --- /dev/null +++ b/nodes/jitsi-meet-1.json @@ -0,0 +1,55 @@ +{ + "name": "jitsi-meet-1", + "normal": { + "knife_zero": { + "host": "10.1.1.20" + } + }, + "automatic": { + "fqdn": "jitsi-meet-1", + "os": "linux", + "os_version": "5.4.0-1073-kvm", + "hostname": "jitsi-meet-1", + "ipaddress": "192.168.122.188", + "roles": [ + "kvm_guest" + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::guest", + "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": { + "chef": { + "version": "17.10.3", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.10.3/lib", + "chef_effortless": null + }, + "ohai": { + "version": "17.9.0", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai" + } + } + }, + "run_list": [ + "recipe[kosmos-base]", + "role[kvm_guest]" + ] +} \ No newline at end of file diff --git a/nodes/mastodon-3.json b/nodes/mastodon-3.json index 293bcd3..66f0d9b 100644 --- a/nodes/mastodon-3.json +++ b/nodes/mastodon-3.json @@ -8,12 +8,13 @@ "automatic": { "fqdn": "mastodon-3", "os": "linux", - "os_version": "5.4.0-1058-kvm", + "os_version": "5.4.0-1071-kvm", "hostname": "mastodon-3", "ipaddress": "192.168.122.161", "roles": [ "mastodon", - "postgresql_client" + "postgresql_client", + "kvm_guest" ], "recipes": [ "kosmos-base", @@ -22,6 +23,7 @@ "kosmos-mastodon", "kosmos-mastodon::default", "kosmos-mastodon::nginx", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -65,7 +67,6 @@ "nginx::commons_conf", "kosmos-nginx::firewall", "tor-full::default", - "poise-git::default", "git::default", "git::package", "kosmos-base::letsencrypt" @@ -86,6 +87,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[mastodon]" ] -} \ No newline at end of file +} diff --git a/nodes/nodejs-4.json b/nodes/nodejs-4.json index 4cca5ad..c974ec9 100644 --- a/nodes/nodejs-4.json +++ b/nodes/nodejs-4.json @@ -12,12 +12,14 @@ "hostname": "nodejs-4", "ipaddress": "192.168.122.106", "roles": [ + "kvm_guest", "kredits_github", "sockethub" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_kvm::guest", "kosmos-hubot::botka_irc-libera-chat", "kredits-github", "kredits-github::default", @@ -81,6 +83,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "recipe[kosmos-hubot::botka_irc-libera-chat]", "role[kredits_github]", "role[sockethub]" diff --git a/nodes/postgres-4.json b/nodes/postgres-4.json index 7cf0419..684e87d 100644 --- a/nodes/postgres-4.json +++ b/nodes/postgres-4.json @@ -12,11 +12,13 @@ "hostname": "postgres-4", "ipaddress": "192.168.122.3", "roles": [ + "kvm_guest", "postgresql_replica" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_kvm::guest", "kosmos_postgresql::hostsfile", "kosmos_postgresql::replica", "kosmos_postgresql::firewall", @@ -52,6 +54,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[postgresql_replica]" ] } \ No newline at end of file diff --git a/nodes/rs-discourse-1.json b/nodes/rs-discourse-1.json index 1852527..ef67953 100644 --- a/nodes/rs-discourse-1.json +++ b/nodes/rs-discourse-1.json @@ -8,17 +8,19 @@ "automatic": { "fqdn": "rs-discourse-1", "os": "linux", - "os_version": "5.4.0-1073-kvm", + "os_version": "5.4.0-1076-kvm", "hostname": "rs-discourse-1", "ipaddress": "192.168.122.30", "roles": [ - "remotestorage_discourse" + "remotestorage_discourse", + "kvm_guest" ], "recipes": [ "kosmos-base", "kosmos-base::default", "remotestorage_discourse", "remotestorage_discourse::default", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -54,6 +56,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[remotestorage_discourse]" ] -} \ No newline at end of file +} diff --git a/nodes/rsk-mainnet-2.json b/nodes/rsk-mainnet-2.json index b24ba39..5d6017a 100644 --- a/nodes/rsk-mainnet-2.json +++ b/nodes/rsk-mainnet-2.json @@ -8,17 +8,19 @@ "automatic": { "fqdn": "rsk-mainnet-2", "os": "linux", - "os_version": "5.4.0-1058-kvm", + "os_version": "5.4.0-1075-kvm", "hostname": "rsk-mainnet-2", "ipaddress": "192.168.122.208", "roles": [ - "rskj_mainnet" + "rskj_mainnet", + "kvm_guest" ], "recipes": [ "kosmos-base", "kosmos-base::default", "kosmos_rsk::rskj", "kosmos_rsk::nginx", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -65,6 +67,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[rskj_mainnet]" ] -} \ No newline at end of file +} diff --git a/nodes/rsk-testnet-3.json b/nodes/rsk-testnet-3.json index 34af5d9..e9b0cf4 100644 --- a/nodes/rsk-testnet-3.json +++ b/nodes/rsk-testnet-3.json @@ -8,17 +8,19 @@ "automatic": { "fqdn": "rsk-testnet-3", "os": "linux", - "os_version": "5.4.0-1058-kvm", + "os_version": "5.4.0-1075-kvm", "hostname": "rsk-testnet-3", "ipaddress": "192.168.122.231", "roles": [ - "rskj_testnet" + "rskj_testnet", + "kvm_guest" ], "recipes": [ "kosmos-base", "kosmos-base::default", "kosmos_rsk::rskj", "kosmos_rsk::nginx", + "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -65,6 +67,7 @@ }, "run_list": [ "recipe[kosmos-base]", + "role[kvm_guest]", "role[rskj_testnet]" ] -} \ No newline at end of file +}