Merge branch 'master' into bugfix/nodejs_update_mastodon_fixes

site-cookbooks/backup/recipes/default.rb

@@ -23,8 +23,12 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+build_essential 'backup gem'
+
+package ["ruby"]
+
 gem_package 'backup' do
-  version '4.4.0'
+  version '5.0.0.beta.2'
 end
 
 backup_data = Chef::EncryptedDataBagItem.load('credentials', 'backup')

site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb

@@ -10,7 +10,7 @@
 # Temporary extra rules for Andromeda
 
 firewall_rule 'ejabberd' do
-  port     [5222, 5269, 5280]
+  port     [5222, 5269, 5280, 5443, 5444]
   protocol :tcp
   command  :allow
 end
@@ -21,14 +21,21 @@ firewall_rule 'bitcoind' do
   command  :allow
 end
 
-firewall_rule 'lightning' do
-  port     [9735, 9736]
+firewall_rule 'lnd' do
+  port     [9736]
+  # port     [9736, 8002]
   protocol :tcp
   command  :allow
 end
 
-firewall_rule 'ltcd' do
-  port     9333
+firewall_rule 'lightningd' do
+  port     [9735]
+  protocol :tcp
+  command  :allow
+end
+
+firewall_rule 'spark_wallet' do
+  port     8008
   protocol :tcp
   command  :allow
 end

site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb

@@ -72,7 +72,8 @@ application botka_freenode_path do
         "GCM_API_KEY"                 => botka_freenode_data_bag_item['gcm_api_key'],
         "VAPID_SUBJECT"               => "https://kosmos.org",
         "VAPID_PUBLIC_KEY"            => botka_freenode_data_bag_item['vapid_public_key'],
-        "VAPID_PRIVATE_KEY"           => botka_freenode_data_bag_item['vapid_private_key']
+        "VAPID_PRIVATE_KEY"           => botka_freenode_data_bag_item['vapid_private_key'],
+        "REDIS_URL"                   => "redis://localhost:6379/botka"
       }
     )
     notifies :run, "execute[systemctl daemon-reload]", :delayed

site-cookbooks/kosmos-ipfs/recipes/cluster.rb

@@ -7,6 +7,8 @@
 # All rights reserved - Do Not Redistribute
 #
 
+node.override['ipfs']['cluster']['version'] = '0.9.0'
+
 include_recipe "ipfs::cluster"
 include_recipe "ipfs::cluster_service"
 

site-cookbooks/kosmos-ipfs/recipes/default.rb

@@ -7,6 +7,8 @@
 # All rights reserved - Do Not Redistribute
 #
 
+node.override['ipfs']['version'] = '0.4.18'
+node.override['ipfs']['checksum'] = '21e6c44c0fa8edf91a727f1e8257342a4c3a879462e656861b0a179e1f6a03f6'
 include_recipe "ipfs"
 
 # Configure ipfs

site-cookbooks/kosmos-mastodon/recipes/default.rb

@@ -48,7 +48,7 @@ npm_package "yarn" do
   version "1.6.0"
 end
 
-ruby_version = "2.5.3"
+ruby_version = "2.6.0"
 
 execute "systemctl daemon-reload" do
   command "systemctl daemon-reload"
@@ -108,8 +108,8 @@ application mastodon_path do
   git do
     user "mastodon"
     group "mastodon"
-    repository "https://github.com/67P/mastodon.git"
-    revision   "kosmos"
+    repository "https://gitea.kosmos.org/kosmos/mastodon.git"
+    revision   "production"
   end
 
   mastodon_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mastodon')

site-cookbooks/kosmos-mediawiki/recipes/default.rb

@@ -105,7 +105,7 @@ mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawik
 #
 
 ark "antispam" do
-  url "https://github.com/CleanTalk/mediawiki-antispam/archive/1.8.zip"
+  url "https://github.com/CleanTalk/mediawiki-antispam/archive/2.1.zip"
   path "#{node['mediawiki']['webdir']}/extensions/Antispam"
   owner node["nginx"]["user"]
   group node["nginx"]["group"]