Merge pull request 'Migrate to self-hosted zerotier network' (#265) from chore/zerotier_migration into master

Reviewed-on: #265

.chef/config.rb

@@ -26,5 +26,5 @@ knife[:automatic_attribute_whitelist] = %w[
   chef_packages
 ]
 knife[:default_attribute_whitelist] = []
-knife[:normal_attribute_whitelist] = ['knife_zero']
+knife[:normal_attribute_whitelist] = ['knife_zero','kosmos-ejabberd']
 knife[:override_attribute_whitelist] = []

nodes/akkounts-1.json

@@ -2,7 +2,7 @@
   "name": "akkounts-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.144"
+      "host": "10.1.1.144"
     }
   },
   "automatic": {
@@ -12,7 +12,7 @@
     "hostname": "akkounts-1",
     "ipaddress": "192.168.122.160",
     "roles": [
-
+      "akkounts"
     ],
     "recipes": [
       "kosmos-base",
@@ -48,6 +48,7 @@
       "nginx::commons_dir",
       "nginx::commons_script",
       "nginx::commons_conf",
+      "kosmos-nginx::firewall",
       "git::default",
       "git::package",
       "kosmos-base::letsencrypt"

nodes/bitcoin-2.json

@@ -2,13 +2,13 @@
   "name": "bitcoin-2",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.163"
+      "host": "10.1.1.163"
     }
   },
   "automatic": {
     "fqdn": "bitcoin-2",
     "os": "linux",
-    "os_version": "5.4.0-42-generic",
+    "os_version": "5.4.0-54-generic",
     "hostname": "bitcoin-2",
     "ipaddress": "192.168.122.148",
     "roles": [
@@ -34,6 +34,7 @@
       "postfix::sasl_auth",
       "hostname::default",
       "ark::default",
+      "kosmos-bitcoin::firewall",
       "git::default",
       "git::package",
       "golang::default"

nodes/ejabberd-1.json

@@ -2,7 +2,7 @@
   "name": "ejabberd-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.166"
+      "host": "10.1.1.166"
     },
     "kosmos-ejabberd": {
       "erlang_node": "ejabberd@draco.kosmos.org"
@@ -39,6 +39,7 @@
       "postfix::_attributes",
       "postfix::sasl_auth",
       "hostname::default",
+      "kosmos-ejabberd::firewall",
       "tor-full::default",
       "kosmos-base::letsencrypt",
       "backup::default",

nodes/ejabberd-2.json

@@ -2,7 +2,7 @@
   "name": "ejabberd-2",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.44"
+      "host": "10.1.1.44"
     },
     "kosmos-ejabberd": {
       "erlang_node": "ejabberd@centaurus.kosmos.org"
@@ -39,6 +39,7 @@
       "postfix::_attributes",
       "postfix::sasl_auth",
       "hostname::default",
+      "kosmos-ejabberd::firewall",
       "tor-full::default",
       "kosmos-base::letsencrypt",
       "backup::default",

nodes/ipfs-1.json

@@ -2,13 +2,13 @@
   "name": "ipfs-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.198"
+      "host": "10.1.1.198"
     }
   },
   "automatic": {
     "fqdn": "ipfs-1",
     "os": "linux",
-    "os_version": "5.4.0-52-generic",
+    "os_version": "5.4.0-54-generic",
     "hostname": "ipfs-1",
     "ipaddress": "192.168.122.195",
     "roles": [
@@ -40,6 +40,7 @@
       "kosmos-nodejs::default",
       "nodejs::nodejs_from_package",
       "nodejs::repo",
+      "kosmos-ipfs::firewall_swarm",
       "firewall::default",
       "chef-sugar::default",
       "kosmos-nginx::default",
@@ -51,6 +52,8 @@
       "nginx::commons_dir",
       "nginx::commons_script",
       "nginx::commons_conf",
+      "kosmos-nginx::firewall",
+      "kosmos-ipfs::firewall_public_gateway",
       "kosmos-base::letsencrypt"
     ],
     "platform": "ubuntu",

nodes/uploads-1.json

@@ -2,7 +2,7 @@
   "name": "uploads-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.98"
+      "host": "10.1.1.98"
     }
   },
   "automatic": {
@@ -41,6 +41,7 @@
       "nginx::commons_dir",
       "nginx::commons_script",
       "nginx::commons_conf",
+      "kosmos-nginx::firewall",
       "kosmos-base::letsencrypt"
     ],
     "platform": "ubuntu",

nodes/wiki-1.json

@@ -2,13 +2,13 @@
   "name": "wiki-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.206"
+      "host": "10.1.1.206"
     }
   },
   "automatic": {
     "fqdn": "wiki-1",
     "os": "linux",
-    "os_version": "5.4.0-45-generic",
+    "os_version": "5.4.0-54-generic",
     "hostname": "wiki-1",
     "ipaddress": "192.168.122.26",
     "roles": [
@@ -51,6 +51,7 @@
       "nginx::commons_dir",
       "nginx::commons_script",
       "nginx::commons_conf",
+      "kosmos-nginx::firewall",
       "mediawiki::nginx",
       "backup::default",
       "logrotate::default",

nodes/zerotier-1.json

@@ -2,7 +2,7 @@
   "name": "zerotier-1",
   "normal": {
     "knife_zero": {
-      "host": "10.147.20.147"
+      "host": "10.1.1.147"
     }
   },
   "automatic": {

site-cookbooks/kosmos_kvm/files/create_vm

@@ -57,7 +57,7 @@ runcmd:
   - curl -s 'https://raw.githubusercontent.com/zerotier/ZeroTierOne/master/doc/contact%40zerotier.com.gpg' | gpg --import
   - curl -s -o /tmp/install_zerotier 'https://install.zerotier.com/'
   - cat /tmp/install_zerotier | gpg && bash /tmp/install_zerotier
-  - zerotier-cli join 12ac4a1e719d706e
+  - zerotier-cli join 8541e5153eb4327c
 EOS
 
   cat > meta-data <<-EOS