Merge pull request 'Rebuild broken VMs, fix small issues in various cookbooks' (#399) from sheesh into master
Reviewed-on: #399
This commit is contained in:
commit
5617591e1c
4
clients/discourse-2.json
Normal file
4
clients/discourse-2.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "discourse-2",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwinJNGMUzUdrZwx/ZCkU\nxZRnuWqZHXHdZtkEG6beMY1sB/PpGknLgcfTjhh4FR/5hIXqBcVdUj3DZiTmhd8o\n0QpEkJPNKd08PN12CyShPwCcIA1KTqsCsNys+bp6Wff84JClAe/Oza6DonoRmhqO\ncFxSQcscuv8a6Gc/1X/aySmS01hwL+r9p0VZBEPNKEObgJXHsGIIbajlxgq037X/\n2/IsIk2etXTUSWPJLxNKSXzxC3l4Izw4NfvUgipByPTeJQ2YAVxbvrDEqquBGk5S\nll/mlF+fKX0QvUhm7sdLiSy++rHc8R1ny+4LnR1gAOscYMuLbDbpJnW0Rc0GEJOL\nVwIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/ejabberd-7.json
Normal file
4
clients/ejabberd-7.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "ejabberd-7",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHfqcI/6w58gLwDFCKxw\n0TeKFOf4MFBnmUGsWyi8BEskkjh4QEDc4pUFeiVuEADFyBfCnALWh004nKhiwamc\nECybfAKlJryoQQEcYZC6H4rZf3SW7xPLk12X00YySNroYM50PM5Ly/G7MI9a669g\n6HNOgn1MYIEh8unpsAHjfKpx72bNutRYKKvBDaHXNvlJ459Jr8HNpERFk8IeaGcF\n4BKqf/MNxkQHOfy7R4ETXeLUBrgD13SmLbs6mM3lXS6IgkoeFyAvAPP4ZgwgiJ6w\nqIKsX4cRt8xnJJ+MTNBX4oc0f9+Gu8bUpr2JZ8tcwq3GUgDjv+JSJpk/uDzzbQUe\nIwIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/gitea-2.json
Normal file
4
clients/gitea-2.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "gitea-2",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7MKbO2vvX7TD1cFKjITh\ntvsf6hgAQRcu7F0kiekx15aC3VLnRgsB9A6SXySVrqvhq/vOSTXZsIC62IQi4Oks\nhhtAA/uvwcOmZ7JkMi0vJ3Ary94dTsg/L8i/0/k2V/D4FRKTV4414wSkpglFGLhl\nvbZ6P17LrqfyAzNJwIDzwd9d6cvt4a0qxvuxbTOHkBuY8tpyGdNzhg6fATadxbBa\nRASEVFb+xqxG3K+8zRmaCFyYqmSPS/8liVVbLPAeUlK6pDyQ5g4T37E5o+CpWfPF\nkBgYw/hHQe6zt1Z4wNJ6mb8YIN/l9kFF3EE99laYxp9Ua7ffrZkRgw12C5Yrn3N6\noQIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/mastodon-3.json
Normal file
4
clients/mastodon-3.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "mastodon-3",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArBsrwKV1RtDfw/5y/L2N\n/x7UL2q6G4JypcD5Q8/aDQOTaGuTR+4RCup+Zcn2wzpdGnX6IzS7cy4/LqMoR2pB\nq8K1FZOXvcCtwsBqsyGWiFdy5aLXy2CkHhTRbkwOLPyb1rBy+qPCBdr055BPZUWm\nTfJaxTmph+Z1J+INz0YndYxz3iKET2V99OP27D7tUdZ7yPgMDbDJWqVxPdYrmAUr\n3QLpmYWsYlmPKhpTAXlvbvzE5vgh5EC8RGfhfYRpacc6QdwbahtxMQAV9+1S2+Vj\nntHfB6PSnYwewUHs9MMn8e33KmNlOZdMAVlyJymBZ4pNceC44vxvZYElp077A6tN\nFwIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/nodejs-4.json
Normal file
4
clients/nodejs-4.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "nodejs-4",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIlB6swdT/Z7tRx/Sm24\n/ro3Jotpsi0DiNS6i7BA1fH0OdbX5CRel62jGC1Nja9QCY8aBd00E8u7KPCuK3iY\n5aA7v91sxWZ7nbXdSwBawaNsTZAe4rMaEkA74INpq7TOvLzHcmDcgRbo+MC2Nw3T\nl0mCOaWkUWFaukTLN8zBldzEbYxztKsaL+b2TbevnSCaPkdD9WmDbmjrUiWTlnpE\nDidMjZ9rp+PcODyjlvwka1yJCoPFoN/+ZL4yXxo49tJ2kbrxSh4tdDZqiZwnajRb\n4SAuRCaHTASDSmZ1Dj0ET/miXuvy6Jgvt06eSMPDKvb+84Dk8zLf4CW6DaE2TfX4\nzwIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/rsk-mainnet-2.json
Normal file
4
clients/rsk-mainnet-2.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "rsk-mainnet-2",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1cuvB3l7sBKJXqjhTih\nQloXteYOr/cQ24R5xUDnHZpCzM75khBjf9ZIX5fskManQ7MI4oFHAaKF6sCWT9QQ\nnL3ON0rCX8wDwBJpKY3iFisAK7f86GO5qkG2ovwG4wO1x69eKX52w33xGpPLPrmw\nBhFv+KfT56KZ3NCvDIQ6tew9VJ3g2V2zUtlL7xZIcdkgTXB06Ec8gbtoCAD3MVUQ\noxMCn+CK6QIAHGxpLIFEv5Y4hNRJ3+0RSuQikhhFzd7P2swnUgDSxDpbfoShroCC\neDw29sapOkQ+PwiHo2Zy8Qtr5m1ToGIhh8l1f/k2vi0Vf2xWVaTjbaeePEDMy9Fd\nKQIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
4
clients/rsk-testnet-3.json
Normal file
4
clients/rsk-testnet-3.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"name": "rsk-testnet-3",
|
||||||
|
"public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxbo3GccgPZp8UWhb9l2w\n+o6Qe5s4Tf/1TMOw3ppLw+IGCZhq9LEe8s8kngbBX7dMywbyDuf8vLXwvAHFKvC+\nx4XOXq0r9xDX8ujTCfqJxiSYk1KTyqM4lmi7qno7F9/Nwo7h3HuVbpkT752ojf+/\nDCSXwHL+uHlF6z3jKZ8iYBRHFrWmudh8bOm6lVsp/Iv4pQ/btZf8W5zULlk/Z6lT\nb6GS538Lnaoeu7wPCf/awL5GBg9findY3oS1lsEE+PfAu6SAHmbJcItMkrON7Esd\ng9xtwsjX1VICpJhOSkVS1nmRfYohELVJMdiKSLq+b5UskscbCjkRGY6GAPH8cVGg\nSQIDAQAB\n-----END PUBLIC KEY-----\n"
|
||||||
|
}
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "discourse-1",
|
"name": "discourse-2",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.20"
|
"host": "10.1.1.35"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "discourse-1",
|
"fqdn": "discourse-2",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1055-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "discourse-1",
|
"hostname": "discourse-2",
|
||||||
"ipaddress": "192.168.122.148",
|
"ipaddress": "192.168.122.104",
|
||||||
"roles": [
|
"roles": [
|
||||||
"discourse"
|
"discourse"
|
||||||
],
|
],
|
||||||
@ -41,8 +41,8 @@
|
|||||||
"cloud": null,
|
"cloud": null,
|
||||||
"chef_packages": {
|
"chef_packages": {
|
||||||
"chef": {
|
"chef": {
|
||||||
"version": "17.9.46",
|
"version": "17.9.52",
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.46/lib",
|
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
|
||||||
"chef_effortless": null
|
"chef_effortless": null
|
||||||
},
|
},
|
||||||
"ohai": {
|
"ohai": {
|
||||||
@ -55,4 +55,4 @@
|
|||||||
"recipe[kosmos-base]",
|
"recipe[kosmos-base]",
|
||||||
"role[discourse]"
|
"role[discourse]"
|
||||||
]
|
]
|
||||||
}
|
}
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "ejabberd-6",
|
"name": "ejabberd-7",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.145"
|
"host": "10.1.1.132"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "ejabberd-6",
|
"fqdn": "ejabberd-7",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1049-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "ejabberd-6",
|
"hostname": "ejabberd-7",
|
||||||
"ipaddress": "192.168.122.248",
|
"ipaddress": "192.168.122.25",
|
||||||
"roles": [
|
"roles": [
|
||||||
"ejabberd",
|
"ejabberd",
|
||||||
"postgresql_client"
|
"postgresql_client"
|
||||||
@ -48,13 +48,13 @@
|
|||||||
"cloud": null,
|
"cloud": null,
|
||||||
"chef_packages": {
|
"chef_packages": {
|
||||||
"chef": {
|
"chef": {
|
||||||
"version": "17.9.26",
|
"version": "17.9.52",
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.26/lib",
|
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
|
||||||
"chef_effortless": null
|
"chef_effortless": null
|
||||||
},
|
},
|
||||||
"ohai": {
|
"ohai": {
|
||||||
"version": "17.9.1",
|
"version": "17.9.0",
|
||||||
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.1/lib/ohai"
|
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "gitea-1",
|
"name": "gitea-2",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.36"
|
"host": "10.1.1.21"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "gitea-1",
|
"fqdn": "gitea-2",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1058-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "gitea-1",
|
"hostname": "gitea-2",
|
||||||
"ipaddress": "192.168.122.218",
|
"ipaddress": "192.168.122.189",
|
||||||
"roles": [
|
"roles": [
|
||||||
"gitea",
|
"gitea",
|
||||||
"postgresql_client"
|
"postgresql_client"
|
@ -1,88 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "mastodon-1",
|
|
||||||
"normal": {
|
|
||||||
"knife_zero": {
|
|
||||||
"host": "10.1.1.156"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"automatic": {
|
|
||||||
"fqdn": "mastodon-1",
|
|
||||||
"os": "linux",
|
|
||||||
"os_version": "5.4.0-1050-kvm",
|
|
||||||
"hostname": "mastodon-1",
|
|
||||||
"ipaddress": "192.168.122.197",
|
|
||||||
"roles": [
|
|
||||||
"mastodon",
|
|
||||||
"postgresql_client"
|
|
||||||
],
|
|
||||||
"recipes": [
|
|
||||||
"kosmos-base",
|
|
||||||
"kosmos-base::default",
|
|
||||||
"kosmos_postgresql::hostsfile",
|
|
||||||
"kosmos-mastodon",
|
|
||||||
"kosmos-mastodon::default",
|
|
||||||
"kosmos-mastodon::nginx",
|
|
||||||
"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-nodejs::default",
|
|
||||||
"nodejs::nodejs_from_package",
|
|
||||||
"nodejs::repo",
|
|
||||||
"kosmos-redis::default",
|
|
||||||
"redis::server",
|
|
||||||
"redis::default",
|
|
||||||
"backup::default",
|
|
||||||
"logrotate::default",
|
|
||||||
"java::default",
|
|
||||||
"java::set_attributes_from_version",
|
|
||||||
"java::openjdk",
|
|
||||||
"java::notify",
|
|
||||||
"java::default_java_symlink",
|
|
||||||
"java::set_java_home",
|
|
||||||
"nodejs::npm",
|
|
||||||
"nodejs::install",
|
|
||||||
"kosmos-nginx::default",
|
|
||||||
"nginx::default",
|
|
||||||
"nginx::package",
|
|
||||||
"nginx::ohai_plugin",
|
|
||||||
"nginx::repo",
|
|
||||||
"nginx::commons",
|
|
||||||
"nginx::commons_dir",
|
|
||||||
"nginx::commons_script",
|
|
||||||
"nginx::commons_conf",
|
|
||||||
"kosmos-nginx::firewall",
|
|
||||||
"tor-full::default",
|
|
||||||
"git::default",
|
|
||||||
"git::package",
|
|
||||||
"kosmos-base::letsencrypt"
|
|
||||||
],
|
|
||||||
"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.14.0",
|
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"run_list": [
|
|
||||||
"recipe[kosmos-base]",
|
|
||||||
"role[mastodon]"
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "mastodon-2",
|
"name": "mastodon-3",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.114"
|
"host": "10.1.1.30"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "mastodon-2",
|
"fqdn": "mastodon-3",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1049-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "mastodon-2",
|
"hostname": "mastodon-3",
|
||||||
"ipaddress": "192.168.122.33",
|
"ipaddress": "192.168.122.161",
|
||||||
"roles": [
|
"roles": [
|
||||||
"mastodon",
|
"mastodon",
|
||||||
"postgresql_client"
|
"postgresql_client"
|
||||||
@ -65,6 +65,7 @@
|
|||||||
"nginx::commons_conf",
|
"nginx::commons_conf",
|
||||||
"kosmos-nginx::firewall",
|
"kosmos-nginx::firewall",
|
||||||
"tor-full::default",
|
"tor-full::default",
|
||||||
|
"poise-git::default",
|
||||||
"git::default",
|
"git::default",
|
||||||
"git::package",
|
"git::package",
|
||||||
"kosmos-base::letsencrypt"
|
"kosmos-base::letsencrypt"
|
@ -1,85 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "nodejs-2",
|
|
||||||
"normal": {
|
|
||||||
"knife_zero": {
|
|
||||||
"host": "10.1.1.229"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"automatic": {
|
|
||||||
"fqdn": "nodejs-2",
|
|
||||||
"os": "linux",
|
|
||||||
"os_version": "5.4.0-1049-kvm",
|
|
||||||
"hostname": "nodejs-2",
|
|
||||||
"ipaddress": "192.168.122.243",
|
|
||||||
"roles": [
|
|
||||||
"kredits_github",
|
|
||||||
"sockethub"
|
|
||||||
],
|
|
||||||
"recipes": [
|
|
||||||
"kosmos-base",
|
|
||||||
"kosmos-base::default",
|
|
||||||
"kosmos-hubot::botka_irc-libera-chat",
|
|
||||||
"kredits-github",
|
|
||||||
"kredits-github::default",
|
|
||||||
"kredits-github::nginx",
|
|
||||||
"sockethub",
|
|
||||||
"sockethub::default",
|
|
||||||
"sockethub::proxy",
|
|
||||||
"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-nodejs::default",
|
|
||||||
"nodejs::nodejs_from_package",
|
|
||||||
"nodejs::repo",
|
|
||||||
"kosmos-redis::default",
|
|
||||||
"redis::server",
|
|
||||||
"redis::default",
|
|
||||||
"backup::default",
|
|
||||||
"logrotate::default",
|
|
||||||
"kosmos-base::letsencrypt",
|
|
||||||
"kosmos-nginx::default",
|
|
||||||
"nginx::default",
|
|
||||||
"nginx::package",
|
|
||||||
"nginx::ohai_plugin",
|
|
||||||
"nginx::repo",
|
|
||||||
"nginx::commons",
|
|
||||||
"nginx::commons_dir",
|
|
||||||
"nginx::commons_script",
|
|
||||||
"nginx::commons_conf",
|
|
||||||
"kosmos-nginx::firewall",
|
|
||||||
"nodejs::npm",
|
|
||||||
"nodejs::install",
|
|
||||||
"sockethub::_firewall"
|
|
||||||
],
|
|
||||||
"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.14.0",
|
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.14.0/lib"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"run_list": [
|
|
||||||
"recipe[kosmos-base]",
|
|
||||||
"recipe[kosmos-hubot::botka_irc-libera-chat]",
|
|
||||||
"role[kredits_github]",
|
|
||||||
"role[sockethub]"
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "nodejs-3",
|
"name": "nodejs-4",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.13"
|
"host": "10.1.1.138"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "nodejs-3",
|
"fqdn": "nodejs-4",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1049-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "nodejs-3",
|
"hostname": "nodejs-4",
|
||||||
"ipaddress": "192.168.122.85",
|
"ipaddress": "192.168.122.106",
|
||||||
"roles": [
|
"roles": [
|
||||||
"kredits_github",
|
"kredits_github",
|
||||||
"sockethub"
|
"sockethub"
|
||||||
@ -39,14 +39,16 @@
|
|||||||
"postfix::_attributes",
|
"postfix::_attributes",
|
||||||
"postfix::sasl_auth",
|
"postfix::sasl_auth",
|
||||||
"hostname::default",
|
"hostname::default",
|
||||||
|
"redisio::default",
|
||||||
|
"redisio::_install_prereqs",
|
||||||
|
"redisio::install",
|
||||||
|
"ulimit::default",
|
||||||
|
"redisio::disable_os_default",
|
||||||
|
"redisio::configure",
|
||||||
|
"redisio::enable",
|
||||||
"kosmos-nodejs::default",
|
"kosmos-nodejs::default",
|
||||||
"nodejs::nodejs_from_package",
|
"nodejs::nodejs_from_package",
|
||||||
"nodejs::repo",
|
"nodejs::repo",
|
||||||
"kosmos-redis::default",
|
|
||||||
"redis::server",
|
|
||||||
"redis::default",
|
|
||||||
"backup::default",
|
|
||||||
"logrotate::default",
|
|
||||||
"kosmos-hubot::_user",
|
"kosmos-hubot::_user",
|
||||||
"kosmos-base::letsencrypt",
|
"kosmos-base::letsencrypt",
|
||||||
"kosmos-nginx::default",
|
"kosmos-nginx::default",
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "rsk-mainnet-1",
|
"name": "rsk-mainnet-2",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.137"
|
"host": "10.1.1.75"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "rsk-mainnet-1",
|
"fqdn": "rsk-mainnet-2",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1048-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "rsk-mainnet-1",
|
"hostname": "rsk-mainnet-2",
|
||||||
"ipaddress": "192.168.122.233",
|
"ipaddress": "192.168.122.208",
|
||||||
"roles": [
|
"roles": [
|
||||||
"rskj_mainnet"
|
"rskj_mainnet"
|
||||||
],
|
],
|
||||||
@ -53,13 +53,13 @@
|
|||||||
"cloud": null,
|
"cloud": null,
|
||||||
"chef_packages": {
|
"chef_packages": {
|
||||||
"chef": {
|
"chef": {
|
||||||
"version": "17.6.18",
|
"version": "17.9.52",
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.6.18/lib",
|
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
|
||||||
"chef_effortless": null
|
"chef_effortless": null
|
||||||
},
|
},
|
||||||
"ohai": {
|
"ohai": {
|
||||||
"version": "17.6.0",
|
"version": "17.9.0",
|
||||||
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.6.0/lib/ohai"
|
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "rsk-testnet-2",
|
"name": "rsk-testnet-3",
|
||||||
"normal": {
|
"normal": {
|
||||||
"knife_zero": {
|
"knife_zero": {
|
||||||
"host": "10.1.1.214"
|
"host": "10.1.1.175"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"automatic": {
|
"automatic": {
|
||||||
"fqdn": "rsk-testnet-2",
|
"fqdn": "rsk-testnet-3",
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"os_version": "5.4.0-1048-kvm",
|
"os_version": "5.4.0-1058-kvm",
|
||||||
"hostname": "rsk-testnet-2",
|
"hostname": "rsk-testnet-3",
|
||||||
"ipaddress": "192.168.122.29",
|
"ipaddress": "192.168.122.231",
|
||||||
"roles": [
|
"roles": [
|
||||||
"rskj_testnet"
|
"rskj_testnet"
|
||||||
],
|
],
|
||||||
@ -53,13 +53,13 @@
|
|||||||
"cloud": null,
|
"cloud": null,
|
||||||
"chef_packages": {
|
"chef_packages": {
|
||||||
"chef": {
|
"chef": {
|
||||||
"version": "17.6.18",
|
"version": "17.9.52",
|
||||||
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.6.18/lib",
|
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
|
||||||
"chef_effortless": null
|
"chef_effortless": null
|
||||||
},
|
},
|
||||||
"ohai": {
|
"ohai": {
|
||||||
"version": "17.6.0",
|
"version": "17.9.0",
|
||||||
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.6.0/lib/ohai"
|
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
@ -2,27 +2,6 @@
|
|||||||
# Cookbook Name:: kosmos-base
|
# Cookbook Name:: kosmos-base
|
||||||
# Recipe:: firewall
|
# Recipe:: firewall
|
||||||
#
|
#
|
||||||
# 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.
|
|
||||||
|
|
||||||
# enable default firewall
|
# enable default firewall
|
||||||
firewall 'default'
|
firewall 'default'
|
||||||
|
@ -7,8 +7,8 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
|||||||
version '0.2.0'
|
version '0.2.0'
|
||||||
|
|
||||||
depends 'kosmos-nodejs'
|
depends 'kosmos-nodejs'
|
||||||
depends 'kosmos-redis'
|
|
||||||
depends 'firewall'
|
depends 'firewall'
|
||||||
depends 'application_javascript'
|
depends 'application_javascript'
|
||||||
depends 'kosmos-ipfs'
|
depends 'kosmos-ipfs'
|
||||||
depends 'git'
|
depends 'git'
|
||||||
|
depends 'redisio'
|
||||||
|
@ -12,8 +12,9 @@ build_essential app_name do
|
|||||||
compile_time true
|
compile_time true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe "kosmos-nodejs"
|
include_recipe "kosmos-nodejs"
|
||||||
include_recipe "kosmos-redis"
|
|
||||||
|
|
||||||
application app_path do
|
application app_path do
|
||||||
data_bag = Chef::EncryptedDataBagItem.load('credentials', app_name)
|
data_bag = Chef::EncryptedDataBagItem.load('credentials', app_name)
|
||||||
|
@ -13,8 +13,9 @@ build_essential app_name do
|
|||||||
compile_time true
|
compile_time true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe "kosmos-nodejs"
|
include_recipe "kosmos-nodejs"
|
||||||
include_recipe "kosmos-redis"
|
|
||||||
include_recipe "kosmos-hubot::_user"
|
include_recipe "kosmos-hubot::_user"
|
||||||
|
|
||||||
application app_path do
|
application app_path do
|
||||||
|
@ -3,8 +3,9 @@
|
|||||||
# Recipe:: default
|
# Recipe:: default
|
||||||
#
|
#
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe "kosmos-nodejs"
|
include_recipe "kosmos-nodejs"
|
||||||
include_recipe "kosmos-redis"
|
|
||||||
|
|
||||||
include_recipe "kosmos-hubot::_user"
|
include_recipe "kosmos-hubot::_user"
|
||||||
include_recipe "kosmos-hubot::hal8000"
|
include_recipe "kosmos-hubot::hal8000"
|
||||||
|
@ -7,8 +7,9 @@ build_essential 'hal8000' do
|
|||||||
compile_time true
|
compile_time true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe "kosmos-nodejs"
|
include_recipe "kosmos-nodejs"
|
||||||
include_recipe "kosmos-redis"
|
|
||||||
include_recipe "kosmos-hubot::_user"
|
include_recipe "kosmos-hubot::_user"
|
||||||
|
|
||||||
unless node.chef_environment == "development"
|
unless node.chef_environment == "development"
|
||||||
|
@ -12,8 +12,9 @@ build_essential app_name do
|
|||||||
compile_time true
|
compile_time true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe "kosmos-nodejs"
|
include_recipe "kosmos-nodejs"
|
||||||
include_recipe "kosmos-redis"
|
|
||||||
include_recipe "kosmos-hubot::_user"
|
include_recipe "kosmos-hubot::_user"
|
||||||
|
|
||||||
# Needed for hubot-kredits
|
# Needed for hubot-kredits
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Start nodejs app
|
Description=Start nodejs app
|
||||||
<% unless @without_redis %>
|
<% unless @without_redis %>
|
||||||
Requires=redis-server.service
|
Requires=redis@6379.service
|
||||||
After=redis-server.service
|
After=redis@6379.service
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
@ -10,7 +10,7 @@ repo = "https://github.com/discourse/discourse_docker"
|
|||||||
|
|
||||||
git deploy_path do
|
git deploy_path do
|
||||||
repository repo
|
repository repo
|
||||||
revision "master"
|
revision "main"
|
||||||
end
|
end
|
||||||
|
|
||||||
systemd_unit "discourse.service" do
|
systemd_unit "discourse.service" do
|
||||||
|
@ -24,3 +24,9 @@ cookbook_file "/usr/local/sbin/create_vm" do
|
|||||||
source "create_vm"
|
source "create_vm"
|
||||||
mode "0750"
|
mode "0750"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
firewall_rule 'ssh-alt-port' do
|
||||||
|
port [2222]
|
||||||
|
protocol :tcp
|
||||||
|
command :allow
|
||||||
|
end
|
||||||
|
@ -6,7 +6,7 @@ description 'Installs/Configures sockethub'
|
|||||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||||
version '0.2.0'
|
version '0.2.0'
|
||||||
|
|
||||||
depends 'kosmos-redis'
|
depends 'firewall'
|
||||||
|
depends 'redisio'
|
||||||
depends 'kosmos-nodejs'
|
depends 'kosmos-nodejs'
|
||||||
depends 'kosmos-nginx'
|
depends 'kosmos-nginx'
|
||||||
depends 'firewall'
|
|
||||||
|
@ -3,8 +3,9 @@
|
|||||||
# Recipe:: default
|
# Recipe:: default
|
||||||
#
|
#
|
||||||
|
|
||||||
|
include_recipe 'redisio::default'
|
||||||
|
include_recipe 'redisio::enable'
|
||||||
include_recipe 'kosmos-nodejs'
|
include_recipe 'kosmos-nodejs'
|
||||||
include_recipe 'kosmos-redis'
|
|
||||||
|
|
||||||
user = "sockethub"
|
user = "sockethub"
|
||||||
group = "sockethub"
|
group = "sockethub"
|
||||||
@ -46,8 +47,8 @@ systemd_unit "sockethub_nodejs.service" do
|
|||||||
content <<-EOF
|
content <<-EOF
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Start sockethub
|
Description=Start sockethub
|
||||||
Requires=redis-server.service
|
Requires=redis@6379.service
|
||||||
After=redis-server.service
|
After=redis@6379.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=#{entry}
|
ExecStart=#{entry}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user