From 41d4f877104e1aa10342702a5692f8498bf14cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 28 Jul 2022 15:38:42 +0200 Subject: [PATCH] Move Zerotier controller It's running on fornax now, and the VMs have been deleted. This way, there's no internal routing needed for it to be publicly accessible by any network member nodes. --- clients/zerotier-2.json | 4 --- clients/zerotier-3.json | 4 --- nodes/fornax.kosmos.org.json | 11 ++++-- nodes/zerotier-2.json | 57 ------------------------------ nodes/zerotier-3.json | 67 ------------------------------------ 5 files changed, 8 insertions(+), 135 deletions(-) delete mode 100644 clients/zerotier-2.json delete mode 100644 clients/zerotier-3.json delete mode 100644 nodes/zerotier-2.json delete mode 100644 nodes/zerotier-3.json diff --git a/clients/zerotier-2.json b/clients/zerotier-2.json deleted file mode 100644 index 910153a..0000000 --- a/clients/zerotier-2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "zerotier-2", - "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsild7NcktO5yVR3Uw0yA\negHFToXHaJMIR1z0WrfHgklHf27lRnWRHOiNjnR6SbsvKIT1MBntg4/mQgotah+n\npo6cKF+0pvUih+hOSBZ6+WwjRf5LxJTaj/R0e2j0Gig6PlDV3yWz8+2AB6gObVcb\nKOQT1w6p+T+S9t6Hv/E0Z8CJW+7ZXDZBvjKTg4kYb47P0J5704wATf38EcVAOuoa\nJsUJoE+dTygx2QUG78eiEYqVDgBak00MA7MpFI/yPrzfn4tjSO1aY2/vy1PyG0Zq\nfgAhuFNZPWQwxMvYsK68gFxfmfwsEn0iJOFh0rPCKYWgOCxzkMLk2z7ppCmNd+H6\nNQIDAQAB\n-----END PUBLIC KEY-----\n" -} \ No newline at end of file diff --git a/clients/zerotier-3.json b/clients/zerotier-3.json deleted file mode 100644 index 9371dce..0000000 --- a/clients/zerotier-3.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "zerotier-3", - "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA70y96zXq3XiMlJhLM5Tm\nCzRiZjwqCBN1fKOoihZpsgXHtqDfYd+5BTyafAKTpzVpAZ7HJp+X4da8T/rb+Pym\nu0PrREXJSXGdWjKIgvsTVUtT51ZFYWtqbpu2l43wh57KCt7Q57JRgKTPyNbHJS0Z\ngrB6fifvQMfzFMf+WKK4X7Z6VXFP1r2cwzRvywC4/d3ZSbJ4fP3g+nnl1623Pxfc\n/BkqyaDeRt2dBEa5I8+OvFkKC8muU99fWR/gPZkkWD4pFNwLPLnPfgdk3bUd7tjN\n/0ardVX9lRJog1CjXCHaUG9aq+WFrtr/tfW+kLff/P7k00E5zplqq9Oz6VUvRMmu\nNQIDAQAB\n-----END PUBLIC KEY-----\n" -} \ No newline at end of file diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json index 7d475f0..b84c8d7 100644 --- a/nodes/fornax.kosmos.org.json +++ b/nodes/fornax.kosmos.org.json @@ -2,7 +2,7 @@ "name": "fornax.kosmos.org", "normal": { "knife_zero": { - "host": "10.1.1.187" + "host": "10.1.1.147" } }, "automatic": { @@ -12,7 +12,8 @@ "hostname": "fornax", "ipaddress": "148.251.83.201", "roles": [ - "nginx_proxy" + "nginx_proxy", + "zerotier_controller" ], "recipes": [ "kosmos-base", @@ -26,6 +27,9 @@ "kosmos_website::default", "kosmos-ejabberd::nginx", "kosmos-akkounts::nginx_api", + "kosmos_zerotier::controller", + "kosmos_zerotier::firewall", + "kosmos_zerotier::zncui", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -71,6 +75,7 @@ "run_list": [ "recipe[kosmos-base]", "recipe[kosmos_kvm::host]", - "role[nginx_proxy]" + "role[nginx_proxy]", + "role[zerotier_controller]" ] } \ No newline at end of file diff --git a/nodes/zerotier-2.json b/nodes/zerotier-2.json deleted file mode 100644 index 02dd22f..0000000 --- a/nodes/zerotier-2.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "zerotier-2", - "normal": { - "knife_zero": { - "host": "10.1.1.147" - } - }, - "automatic": { - "fqdn": "zerotier-2", - "os": "linux", - "os_version": "5.4.0-1026-kvm", - "hostname": "zerotier-2", - "ipaddress": "192.168.122.214", - "roles": [ - "zerotier_controller" - ], - "recipes": [ - "kosmos-base", - "kosmos-base::default", - "kosmos_zerotier::controller", - "kosmos_zerotier::firewall", - "kosmos_zerotier::zncui", - "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.9.46", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.46/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[zerotier_controller]" - ] -} diff --git a/nodes/zerotier-3.json b/nodes/zerotier-3.json deleted file mode 100644 index e4421c4..0000000 --- a/nodes/zerotier-3.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "zerotier-3", - "normal": { - "knife_zero": { - "host": "165.232.88.175" - } - }, - "automatic": { - "fqdn": "zerotier-3", - "os": "linux", - "os_version": "5.4.0-99-generic", - "hostname": "zerotier-3", - "ipaddress": "165.232.88.175", - "roles": [ - "zerotier_controller" - ], - "recipes": [ - "kosmos_zerotier::controller", - "kosmos_zerotier::firewall", - "kosmos_zerotier::zncui", - "kosmos-base", - "kosmos-base::default", - "kosmos-base::firewall", - "apt::default", - "timezone_iii::default", - "timezone_iii::debian", - "ntp::default", - "ntp::apparmor", - "kosmos-base::systemd_emails", - "apt::unattended-upgrades", - "kosmos-postfix::default", - "postfix::default", - "postfix::_common", - "postfix::_attributes", - "postfix::sasl_auth", - "hostname::default" - ], - "platform": "ubuntu", - "platform_version": "20.04", - "cloud": { - "public_ipv4_addrs": [ - "165.232.88.175" - ], - "local_ipv4_addrs": [ - "10.133.0.2" - ], - "provider": "digital_ocean", - "public_ipv4": "165.232.88.175", - "local_ipv4": "10.133.0.2" - }, - "chef_packages": { - "chef": { - "version": "17.9.46", - "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.46/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": [ - "role[zerotier_controller]", - "recipe[kosmos-base]" - ] -} \ No newline at end of file