Merge branch 'master' into feature/7-ejabberd

Berksfile

@@ -64,4 +64,4 @@ cookbook 'mariadb',                '= 0.3.1'
 cookbook 'mingw',                  '= 2.0.0'
 cookbook 'ipfs',
          git: 'https://github.com/67P/ipfs-cookbook.git',
-         ref: 'v0.1.1'
+         ref: 'v0.1.2'

Berksfile.lock

@@ -22,8 +22,8 @@ DEPENDENCIES
   iis (= 6.7.1)
   ipfs
     git: https://github.com/67P/ipfs-cookbook.git
-    revision: 0668eae4c574fc5f8c630a9a888159b6dd0abe79
-    ref: v0.1.1
+    revision: 78d3edfd78c56a25494ac84528e152762f38b3be
+    ref: v0.1.2
   logrotate (= 2.2.0)
   mariadb (= 0.3.1)
   mediawiki
@@ -120,7 +120,7 @@ GRAPH
   hostsfile (2.4.5)
   iis (6.7.1)
     windows (>= 2.0)
-  ipfs (0.1.1)
+  ipfs (0.1.2)
     ark (>= 0.0.0)
   logrotate (2.2.0)
   mariadb (0.3.1)

cookbooks/ipfs/metadata.json

@@ -20,7 +20,7 @@
   "recipes": {
 
   },
-  "version": "0.1.1",
+  "version": "0.1.2",
   "source_url": "https://github.com/67P/ipfs-cookbook",
   "issues_url": "https://github.com/67P/ipfs-cookbook/issues",
   "privacy": false,

cookbooks/ipfs/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org'
 license          'MIT'
 description      'Installs/Configures ipfs'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.1'
+version          '0.1.2'
 
 supports %w(ubuntu debian)
 

cookbooks/ipfs/recipes/_user.rb

@@ -33,5 +33,6 @@ user 'ipfs' do
   uid 4737
   gid 4737
   home '/home/ipfs'
+  shell '/bin/bash'
   manage_home true
 end

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