From 95e92a07036ada95493ced23374813aedf9df5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:19:06 +0200 Subject: [PATCH 1/8] Bump the ipfs version, remove the ipfs-cluster attributes Co-authored-by: Sebastian Kippe --- attributes/default.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 70456a1..e47da58 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,9 +1,5 @@ -node.default['ipfs']['version'] = '0.4.17' -node.default['ipfs']['checksum'] = '1bb1050ebe74f9042ac721eb1b71f92e1b0e78e54c59dadfde13080facb2901c' - -node.default['ipfs']['cluster']['version'] = '0.4.0' -node.default['ipfs']['cluster']['service']['checksum'] = 'a168e9d3544f53f3d734098533d606b88417f6319bc8f83b1af7ef1328ed246a' -node.default['ipfs']['cluster']['ctl']['checksum'] = 'c82ba76b21a6fc42c8c635962a356c51fe6d4d0fbac2a77bfdd159cbe6a56f49' +node.default['ipfs']['version'] = '0.4.21' +node.default['ipfs']['checksum'] = 'a7ec5ddc4d52f818cbf3853a80f7ec17f9fde9128f039485dbe1889cf673d562' node.default['ipfs']['config'] = { # Do not contact local network addresses. This will stop platforms like Hetzner From d54e96292646646492e260e0279b7c0c19c6d46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:20:05 +0200 Subject: [PATCH 2/8] Get rid of the cluster recipes and tests Co-authored-by: Sebastian Kippe --- recipes/cluster.rb | 50 --------- recipes/cluster_bootstrap.rb | 33 ------ recipes/cluster_service.rb | 64 ----------- spec/unit/recipes/cluster_service_spec.rb | 55 ---------- .../default/ipfs-cluster.initd.service.erb | 102 ------------------ .../default/ipfs-cluster.systemd.service.erb | 13 --- .../cluster/serverspec/ipfs_cluster_spec.rb | 27 ----- .../data_bags/credentials/ipfs_cluster.json | 4 - 8 files changed, 348 deletions(-) delete mode 100644 recipes/cluster.rb delete mode 100644 recipes/cluster_bootstrap.rb delete mode 100644 recipes/cluster_service.rb delete mode 100644 spec/unit/recipes/cluster_service_spec.rb delete mode 100644 templates/default/ipfs-cluster.initd.service.erb delete mode 100644 templates/default/ipfs-cluster.systemd.service.erb delete mode 100644 test/integration/cluster/serverspec/ipfs_cluster_spec.rb delete mode 100644 test/integration/data_bags/credentials/ipfs_cluster.json diff --git a/recipes/cluster.rb b/recipes/cluster.rb deleted file mode 100644 index 25b81fc..0000000 --- a/recipes/cluster.rb +++ /dev/null @@ -1,50 +0,0 @@ -# -# Cookbook Name:: ipfs -# Recipe:: cluster -# -# The MIT License (MIT) -# -# Copyright:: 2018, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -include_recipe 'ipfs::_user' - -version = node['ipfs']['cluster']['version'] - -ark 'ipfs-cluster-service' do - url "https://dist.ipfs.io/ipfs-cluster-service/v#{version}/ipfs-cluster-service_v#{version}_linux-amd64.tar.gz" - checksum node['ipfs']['cluster']['service']['checksum'] - has_binaries ['ipfs-cluster-service'] -end - -ark 'ipfs-cluster-ctl' do - url "https://dist.ipfs.io/ipfs-cluster-ctl/v#{version}/ipfs-cluster-ctl_v#{version}_linux-amd64.tar.gz" - checksum node['ipfs']['cluster']['ctl']['checksum'] - has_binaries ['ipfs-cluster-ctl'] -end - -credentials = data_bag_item('credentials', 'ipfs_cluster') - -execute 'ipfs-cluster-service init' do - user 'ipfs' - environment 'CLUSTER_SECRET' => credentials['secret'], - 'IPFS_CLUSTER_PATH' => '/home/ipfs/.ipfs-cluster' - not_if { File.exist? '/home/ipfs/.ipfs-cluster/service.json' } -end diff --git a/recipes/cluster_bootstrap.rb b/recipes/cluster_bootstrap.rb deleted file mode 100644 index 295ee0f..0000000 --- a/recipes/cluster_bootstrap.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Cookbook Name:: ipfs -# Recipe:: cluster_bootstrap -# -# The MIT License (MIT) -# -# Copyright:: 2018, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -include_recipe 'ipfs::_user' - -execute "ipfs-cluster-service daemon --bootstrap #{peer}" do - user 'ipfs' - environment 'IPFS_CLUSTER_PATH' => '/home/ipfs/.ipfs-cluster' - not_if { File.exist? '/home/ipfs/.ipfs-cluster/service.json' } -end diff --git a/recipes/cluster_service.rb b/recipes/cluster_service.rb deleted file mode 100644 index ad682db..0000000 --- a/recipes/cluster_service.rb +++ /dev/null @@ -1,64 +0,0 @@ -# -# Cookbook Name:: ipfs -# Recipe:: cluster_service -# -# The MIT License (MIT) -# -# Copyright:: 2018, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -if platform?('ubuntu') && node['platform_version'].to_f < 15.04 || - platform?('debian') && node['platform_version'].to_f < 8 - template 'ipfs.initd-cluster.service.erb' do - path '/etc/init.d/ipfs-cluster' - source 'ipfs-cluster.initd.service.erb' - owner 'root' - group 'root' - mode '0750' - notifies :restart, 'service[ipfs-cluster]', :delayed - end - - service 'ipfs-cluster' do - provider Chef::Provider::Service::Init::Debian - action [:enable] - supports start: true, stop: true, restart: true, reload: false, status: true - end - -else - execute 'systemctl daemon-reload' do - command 'systemctl daemon-reload' - action :nothing - end - - template 'ipfs-cluster.systemd.service.erb' do - path '/lib/systemd/system/ipfs-cluster.service' - source 'ipfs-cluster.systemd.service.erb' - owner 'root' - group 'root' - mode '0644' - notifies :run, 'execute[systemctl daemon-reload]', :delayed - notifies :restart, 'service[ipfs-cluster]', :delayed - end - - service 'ipfs-cluster' do - provider Chef::Provider::Service::Systemd - action [:enable] - end -end diff --git a/spec/unit/recipes/cluster_service_spec.rb b/spec/unit/recipes/cluster_service_spec.rb deleted file mode 100644 index ddefa44..0000000 --- a/spec/unit/recipes/cluster_service_spec.rb +++ /dev/null @@ -1,55 +0,0 @@ -# -# Cookbook:: ipfs -# Spec:: default -# -# The MIT License (MIT) -# -# Copyright:: 2018, Kosmos Developers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -require 'spec_helper' - -describe 'ipfs::cluster_service' do - context 'When all attributes are default, on Ubuntu 16.04' do - let(:chef_run) do - # for a complete list of available platforms and versions see: - # https://github.com/customink/fauxhai/blob/master/PLATFORMS.md - runner = ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04') - runner.converge(described_recipe) - end - - it 'enables the service' do - expect(chef_run).to enable_service('ipfs-cluster') - end - end - - context 'When all attributes are default, on Ubuntu 18.04' do - let(:chef_run) do - # for a complete list of available platforms and versions see: - # https://github.com/customink/fauxhai/blob/master/PLATFORMS.md - runner = ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '18.04') - runner.converge(described_recipe) - end - - it 'enables the service' do - expect(chef_run).to enable_service('ipfs-cluster') - end - end -end diff --git a/templates/default/ipfs-cluster.initd.service.erb b/templates/default/ipfs-cluster.initd.service.erb deleted file mode 100644 index a301208..0000000 --- a/templates/default/ipfs-cluster.initd.service.erb +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ipfs-cluster daemon -# Required-Start: $local_fs $remote_fs $network $syslog $named -# Required-Stop: $local_fs $remote_fs $network $syslog $named -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts the ipfs-cluster daemon -# Description: Starts the ipfs-cluster daemon using the start-stop-daemon -### END INIT INFO - -# Author: Dylan Powers = 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() { - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test >/dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \ - --background --chuid $IPFS_USER --no-close \ - --exec /usr/bin/env IPFS_PATH="$IPFS_PATH" $DAEMON 2>>$IPFS_PATH/daemon.log 1>/dev/null \ - -- $DAEMON_ARGS \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() { - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - - # Delete the pid - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart) - do_stop - do_start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2 - exit 3 - ;; -esac diff --git a/templates/default/ipfs-cluster.systemd.service.erb b/templates/default/ipfs-cluster.systemd.service.erb deleted file mode 100644 index 87750a9..0000000 --- a/templates/default/ipfs-cluster.systemd.service.erb +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Start ipfs-cluster - -[Service] -ExecStart=/usr/local/bin/ipfs-cluster-service daemon --upgrade -User=ipfs -Group=ipfs -Restart=always -# Raise the ulimit (max number of open files) -LimitNOFILE=64000 - -[Install] -WantedBy=multi-user.target diff --git a/test/integration/cluster/serverspec/ipfs_cluster_spec.rb b/test/integration/cluster/serverspec/ipfs_cluster_spec.rb deleted file mode 100644 index 23ba688..0000000 --- a/test/integration/cluster/serverspec/ipfs_cluster_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'serverspec' - -# Required by serverspec -set :backend, :exec - -describe 'ipfs-cluster-ctl' do - # It is in the PATH - describe command('which ipfs-cluster-ctl') do - its(:exit_status) { should eq 0 } - end -end - -describe 'ipfs-cluster-service' do - # It is in the PATH - describe command('which ipfs-cluster-service') do - its(:exit_status) { should eq 0 } - end - - it 'is listening on port 9096' do - expect(port(9096)).to be_listening - end - - it 'runs the ipfs-cluster-service' do - expect(service('ipfs-cluster')).to be_running - expect(service('ipfs-cluster')).to be_enabled - end -end diff --git a/test/integration/data_bags/credentials/ipfs_cluster.json b/test/integration/data_bags/credentials/ipfs_cluster.json deleted file mode 100644 index d2458b2..0000000 --- a/test/integration/data_bags/credentials/ipfs_cluster.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "id": "ipfs_cluster", - "secret": "d9de2f31ca7e9989949010fed2e704f42b8e96fa1e8e60a0ad26611f0a01cf07" -} From 0e6ac38434ca57b27a20e1116c7e8a59475f3661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:22:08 +0200 Subject: [PATCH 3/8] Improve the default config Enable CORS and writeable gateway by default, remove config that only applies to Kosmos Co-authored-by: Sebastian Kippe --- attributes/default.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index e47da58..02b50c4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,6 +1,8 @@ node.default['ipfs']['version'] = '0.4.21' node.default['ipfs']['checksum'] = 'a7ec5ddc4d52f818cbf3853a80f7ec17f9fde9128f039485dbe1889cf673d562' +node.default['ipfs']['ulimit'] = 64000 +node.default['ipfs']['memory_max'] = "512M" node.default['ipfs']['config'] = { # Do not contact local network addresses. This will stop platforms like Hetzner # to block your server (https://github.com/ipfs/go-ipfs/issues/1226) @@ -19,15 +21,11 @@ node.default['ipfs']['config'] = { '/ip4/198.51.100.0/ipcidr/24', '/ip4/203.0.113.0/ipcidr/24', '/ip4/240.0.0.0/ipcidr/4'], - # Do not keep track of bandwidth metrics. Disabling bandwidth metrics can - # lead to a slight performance improvement, as well as a reduction in memory - # usage. - 'Swarm.DisableBandwidthMetrics' => true, - # Disable the p2p-circuit relay transport - 'Swarm.DisableRelay' => true, - # Number of connections that, when exceeded, will trigger a connection GC - # operation - 'Swarm.ConnMgr.HighWater' => 10, - # Minimum number of connections to maintain - 'Swarm.ConnMgr.LowWater' => 1, + # Set up the Gateway to be writable + "Gateway.Writable" => true, + + # Set up CORS headers + "API.HTTPHeaders.Access-Control-Allow-Credentials" => ["true"], + "API.HTTPHeaders.Access-Control-Allow-Methods" => ["PUT", "GET", "POST"], + "API.HTTPHeaders.Access-Control-Allow-Origin" => ["*"] } From 9cdbf6d9472b36a08e2b82c7bbadc1c76e96523d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:24:21 +0200 Subject: [PATCH 4/8] Use the new attributes for ulimit and max memory Co-authored-by: Sebastian Kippe --- templates/default/ipfs.systemd.service.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/default/ipfs.systemd.service.erb b/templates/default/ipfs.systemd.service.erb index a15ae81..f8155fb 100644 --- a/templates/default/ipfs.systemd.service.erb +++ b/templates/default/ipfs.systemd.service.erb @@ -7,9 +7,9 @@ User=ipfs Group=ipfs Restart=always # Raise the ulimit (max number of open files) -LimitNOFILE=64000 -# Limit the memory usage to 256MB -MemoryMax=256M +LimitNOFILE=<%= node['ipfs']['ulimit'] %> +# Limit the memory usage +MemoryMax=<%= node['ipfs']['memory_max'] %> [Install] WantedBy=multi-user.target From 679f78d24893a97c791913577bcd246cf1402a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:26:23 +0200 Subject: [PATCH 5/8] Bump the cookbook version Co-authored-by: Sebastian Kippe --- Berksfile.lock | 2 +- metadata.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Berksfile.lock b/Berksfile.lock index 7266f30..1167417 100644 --- 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.1.3) + ipfs (0.4.0) ark (>= 0.0.0) mingw (2.1.0) seven_zip (>= 0.0.0) diff --git a/metadata.rb b/metadata.rb index 1ee7900..009895f 100644 --- a/metadata.rb +++ b/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.3.0' +version '0.4.0' supports %w(ubuntu debian) From 468b6d9a9d93401b4bbb79a1ad4fb648d655f74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:42:13 +0200 Subject: [PATCH 6/8] Fix the linting warnings --- attributes/default.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 02b50c4..0e06718 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,7 +2,7 @@ node.default['ipfs']['version'] = '0.4.21' node.default['ipfs']['checksum'] = 'a7ec5ddc4d52f818cbf3853a80f7ec17f9fde9128f039485dbe1889cf673d562' node.default['ipfs']['ulimit'] = 64000 -node.default['ipfs']['memory_max'] = "512M" +node.default['ipfs']['memory_max'] = '512M' node.default['ipfs']['config'] = { # Do not contact local network addresses. This will stop platforms like Hetzner # to block your server (https://github.com/ipfs/go-ipfs/issues/1226) @@ -22,10 +22,10 @@ node.default['ipfs']['config'] = { '/ip4/203.0.113.0/ipcidr/24', '/ip4/240.0.0.0/ipcidr/4'], # Set up the Gateway to be writable - "Gateway.Writable" => true, + 'Gateway.Writable' => true, # Set up CORS headers - "API.HTTPHeaders.Access-Control-Allow-Credentials" => ["true"], - "API.HTTPHeaders.Access-Control-Allow-Methods" => ["PUT", "GET", "POST"], - "API.HTTPHeaders.Access-Control-Allow-Origin" => ["*"] + 'API.HTTPHeaders.Access-Control-Allow-Credentials' => ['true'], + 'API.HTTPHeaders.Access-Control-Allow-Methods' => ['PUT', 'GET', 'POST'], + 'API.HTTPHeaders.Access-Control-Allow-Origin' => ['*'], } From f118a954faa2304c5eab25047b54634c654a89b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:46:22 +0200 Subject: [PATCH 7/8] Another linting fix --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 0e06718..97b881f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -26,6 +26,6 @@ node.default['ipfs']['config'] = { # Set up CORS headers 'API.HTTPHeaders.Access-Control-Allow-Credentials' => ['true'], - 'API.HTTPHeaders.Access-Control-Allow-Methods' => ['PUT', 'GET', 'POST'], + 'API.HTTPHeaders.Access-Control-Allow-Methods' => %w(PUT GET POST), 'API.HTTPHeaders.Access-Control-Allow-Origin' => ['*'], } From 7b524204c87ed988f0f4de6b2ee8c78bd7b9c14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 5 Jul 2019 15:50:30 +0200 Subject: [PATCH 8/8] Update the README for the changes to the config attribute --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4970296..bbfe9d6 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,7 @@ Just include `ipfs` in your node's `run_list`: - `node.['ipfs']['version']` - the Go IPFS version to download from the official site (64bit) - `node['ipfs']['checksum']` - the SHA256 checksum for the package -- `node['ipfs']['config']['swarm']['addr_filter']` - the network ranges to not -connect to. This will stop platforms like Hetzner to block your server -(https://github.com/ipfs/go-ipfs/issues/1226) +- `node['ipfs']['config']` - a hash of config options ## Resources @@ -67,7 +65,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 -Copyright: 2018, [Kosmos Developers](https://kredits.kosmos.org/) +Copyright: 2018-2019, [Kosmos Developers](https://kredits.kosmos.org/) ``` Unless otherwise noted, all files are released under the MIT license, possible