Merge pull request 'Update go-ipfs to 0.7.0' (#4 ) from chore/update_go_ipfs into master

Reviewed-on: #4
Bump cookbook version
2020-10-25 11:04:21 +00:00 · 2020-10-25 11:25:48 +01:00 · 2020-10-25 11:18:25 +01:00 · 2019-08-14 19:01:33 +02:00 · 2019-08-14 18:59:32 +02:00 · 2019-08-14 17:10:14 +02:00
9 changed files with 14 additions and 27 deletions
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -13,12 +13,10 @@ provisioner:

 verifier:
  name: inspec
+  root_path: '/opt/verifier' # Needed for the specs to be detected in Docker
+  chef_license: accept

 platforms:
-  - name: ubuntu-16.04
-    driver:
-      image: dokken/ubuntu-16.04
-      pid_one_command: /bin/systemd
  - name: ubuntu-18.04
    driver:
      image: dokken/ubuntu-18.04
@@ -33,8 +31,3 @@ suites:
    run_list:
      - recipe[ipfs::default]
    attributes:
-  - name: cluster
-    run_list:
-      - recipe[ipfs::cluster]
-      - recipe[ipfs::cluster_service]
-    attributes:
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,17 +6,14 @@ provisioner:
  name: chef_zero

 platforms:
-  - name: ubuntu-16.04
  - name: ubuntu-18.04
  - name: debian-9

+verifier:
+  chef_license: accept
+
 suites:
  - name: default
    run_list:
      - recipe[ipfs::default]
    attributes:
-  - name: cluster
-    run_list:
-      - recipe[ipfs::cluster]
-      - recipe[ipfs::cluster_service]
-    attributes:
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,6 @@ services: docker
 env:
  matrix:
  - INSTANCE=default-debian-9
-  - INSTANCE=default-ubuntu-1604
  - INSTANCE=default-ubuntu-1804

 before_script:
@@ -30,7 +29,7 @@ before_script:
  - cookstyle --version
  - foodcritic --version

-script: CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=.kitchen.dokken.yml CHEF_VERSION=13.10.4 kitchen verify ${INSTANCE}
+script: CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen test ${INSTANCE}

 matrix:
  include:
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -10,7 +10,7 @@ GRAPH
  build-essential (8.1.1)
    mingw (>= 1.1)
    seven_zip (>= 0.0.0)
-  ipfs (0.4.0)
+  ipfs (0.4.2)
    ark (>= 0.0.0)
  mingw (2.1.0)
    seven_zip (>= 0.0.0)
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ kitchen verify # Run the integration tests for Ubuntu 16.04, 18.06 and Debian 9

 ## License and Authors

-Authors: Kosmos Developers mail@kosmos.org
+Authors: Kosmos Developers mail@kosmos.org  
 Copyright: 2018-2019, [Kosmos Developers](https://kredits.kosmos.org/)

 ```
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,5 +1,5 @@
-node.default['ipfs']['version'] = '0.4.21'
-node.default['ipfs']['checksum'] = 'a7ec5ddc4d52f818cbf3853a80f7ec17f9fde9128f039485dbe1889cf673d562'
+node.default['ipfs']['version'] = '0.7.0'
+node.default['ipfs']['checksum'] = 'ef7c3f1bcae94c13c6e1033855ff99bb8e19089e01ea5018437847854c8c811f'

 node.default['ipfs']['ulimit'] = 64000
 node.default['ipfs']['memory_max'] = '512M'
--- a/metadata.rb
+++ b/metadata.rb
@@ -2,9 +2,9 @@ name             'ipfs'
 maintainer       'Kosmos Developers'
 maintainer_email 'mail@kosmos.org'
 license          'MIT'
-description      'Installs/Configures ipfs'
+description      'Installs/Configures go-ipfs'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.4.0'
+version          '0.7.0'

 supports %w(ubuntu debian)

--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -32,6 +32,7 @@ ark 'ipfs' do
  url "https://dist.ipfs.io/go-ipfs/v#{version}/go-ipfs_v#{version}_linux-amd64.tar.gz"
  checksum node['ipfs']['checksum']
  has_binaries ['ipfs']
+  notifies :restart, 'service[ipfs]', :delayed
 end

 execute 'ipfs init --empty-repo' do
--- a/test/integration/default/serverspec/ipfs_spec.rb
+++ b/test/integration/default/serverspec/ipfs_spec.rb
@@ -45,10 +45,7 @@ describe 'IPFS' do

  {
    'Swarm.AddrFilters' => addr_filters.rstrip,
-    'Swarm.DisableBandwidthMetrics' => true,
-    'Swarm.DisableRelay' => true,
-    'Swarm.ConnMgr.HighWater' => 10,
-    'Swarm.ConnMgr.LowWater' => 1,
+    'Gateway.Writable' => true,
  }.each do |k, v|
    describe command("IPFS_PATH=/home/ipfs/.ipfs ipfs config '#{k}'") do
      let(:sudo_options) { '-u ipfs -i' }
Author	SHA1	Message	Date
raucao	d7c25b6ce5	Merge pull request 'Update go-ipfs to 0.7.0' (#4 ) from chore/update_go_ipfs into master Reviewed-on: #4	2020-10-25 11:04:21 +00:00
Sebastian Kippe	9f430fa6d2	Bump cookbook version	2020-10-25 11:25:48 +01:00
Sebastian Kippe	05a04ac832	Update go-ipfs to 0.7	2020-10-25 11:18:25 +01:00
Sebastian Kippe	2dfbc073ed	Merge pull request #16 from 67P/bugfix/14-restart_on_update Restart the service on update	2019-08-14 19:01:33 +02:00
Sebastian Kippe	e2c00c2afb	Merge pull request #15 from 67P/bugfix/specs Fix the specs	2019-08-14 18:59:32 +02:00
Greg Karékinian	b3b03a9744	Remove Ubuntu 16.04 from the Travis matrix	2019-08-14 17:10:14 +02:00
Greg Karékinian	d845e3443a	Add the CHEF_LICENSE environment variable again	2019-08-14 17:07:30 +02:00
Greg Karékinian	ae5a27d100	Fix a linting error	2019-08-14 17:05:39 +02:00
Greg Karékinian	200552d1b7	Restart the service on update A restart notification on the service was missing on the ark resource that takes care of downloading and installing/updating go-ipfs Fixes #14	2019-08-14 17:02:20 +02:00
Greg Karékinian	856b48d015	Fix the specs not being seen on Travis	2019-08-14 16:49:16 +02:00
Greg Karékinian	9fd88a7da3	Accept the Chef license as part of the config files	2019-08-14 16:47:41 +02:00
Greg Karékinian	2552847d7e	Remove the deleted cluster specs from the kitchen config files	2019-08-14 16:38:30 +02:00
Greg Karékinian	b6028ffff8	Do not run specs on Ubuntu 16.04	2019-08-14 16:38:30 +02:00
Greg Karékinian	f25802a6ce	Fix the checks for the default config in the integration specs	2019-08-14 16:33:03 +02:00
Sebastian Kippe	5c31191ff8	Merge pull request #12 from 67P/feature/go-ipfs_0.4.22 Update go-ipfs to 0.4.22	2019-08-14 11:32:43 +02:00
Greg Karékinian	7dc20eea12	Update go-ipfs to 0.4.22 https://blog.ipfs.io/054-go-ipfs-0.4.22 Closes #11	2019-08-14 11:27:17 +02:00
Greg Karékinian	1d09c15108	Fix Markdown line break	2019-07-05 16:01:24 +02:00