diff --git a/Berksfile b/Berksfile index d8d0ca2..f11c88c 100644 --- a/Berksfile +++ b/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: 'master' + ref: 'v0.1.2' diff --git a/Berksfile.lock b/Berksfile.lock index bb1877e..cacc2c8 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -22,8 +22,8 @@ DEPENDENCIES iis (= 6.7.1) ipfs git: https://github.com/67P/ipfs-cookbook.git - revision: b98b45584cdb00a1a7b41e837352ce4156f127e7 - ref: master + 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.0) + ipfs (0.1.2) ark (>= 0.0.0) logrotate (2.2.0) mariadb (0.3.1) @@ -207,7 +207,7 @@ GRAPH chef_nginx (>= 0.0.0) database (>= 1.6.0) iis (>= 1.6.2) - mysql (>= 6.0.0) + mysql (>= 6.0) mysql2_chef_gem (>= 1.0.1) openssl (>= 0.0.0) php (>= 0.0.0) diff --git a/Gemfile b/Gemfile index dc7ee1e..e4e8bf4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'chef', '~> 12.21.1' -gem 'berkshelf', '~> 6.3' -gem 'knife-solo', '>= 0.7.0.pre3' +gem 'chef', '~> 14.9.13' +gem 'berkshelf', '~> 7.0' +gem 'knife-solo', '~> 0.7.0' gem 'knife-solo_data_bag' gem 'cookstyle' gem 'test-kitchen' diff --git a/Gemfile.lock b/Gemfile.lock index a83e313..2a812af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,43 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.8.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) - berkshelf (6.3.2) - buff-config (~> 2.0) - buff-extensions (~> 2.0) - chef (>= 12.7.2, < 14.0) + berkshelf (7.0.7) + chef (>= 13.6.52) + chef-config cleanroom (~> 1.0) concurrent-ruby (~> 1.0) - faraday (~> 0.9) - httpclient (~> 2.7) - minitar (~> 0.5, >= 0.5.4) + minitar (>= 0.6) mixlib-archive (~> 0.4) + mixlib-config (>= 2.2.5) mixlib-shellout (~> 2.0) octokit (~> 4.0) retryable (~> 2.0) - ridley (~> 5.0) solve (~> 4.0) - thor (~> 0.19, < 0.19.2) - buff-config (2.0.0) - buff-extensions (~> 2.0) - varia_model (~> 0.6) - buff-extensions (2.0.0) - buff-ignore (1.2.0) - buff-ruby_engine (1.0.0) - buff-shell_out (1.1.0) - buff-ruby_engine (~> 1.0) + thor (>= 0.20) builder (3.2.3) - celluloid (0.16.0) - timers (~> 4.0.0) - celluloid-io (0.16.2) - celluloid (>= 0.16.0) - nio4r (>= 1.1.0) - chef (12.21.1) + chef (14.9.13) addressable bundler (>= 1.10) - chef-config (= 12.21.1) - chef-zero (>= 4.8, < 13) + chef-config (= 14.9.13) + chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) + ffi (~> 1.9, >= 1.9.25) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - mixlib-archive (~> 0.4) - mixlib-authentication (~> 1.4) + mixlib-archive (>= 0.4, < 2.0) + mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) - mixlib-log (~> 1.3) - mixlib-shellout (~> 2.0) + mixlib-log (~> 2.0, >= 2.0.3) + mixlib-shellout (~> 2.4) net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 2.9, < 5.0) + net-ssh (~> 4.2) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (>= 8.6.0.alpha.1, < 13) + ohai (~> 14.0) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -64,59 +48,65 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef-config (12.21.1) + chef-config (14.9.13) addressable fuzzyurl - mixlib-config (~> 2.0) + mixlib-config (>= 2.2.12, < 3.0) mixlib-shellout (~> 2.0) - chef-zero (5.3.2) + tomlrb (~> 1.2) + chef-zero (14.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) - mixlib-log (~> 1.3) - rack (~> 2.0) + mixlib-log (~> 2.0) + rack (~> 2.0, >= 2.0.6) uuidtools (~> 2.1) cleanroom (1.0.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) cookstyle (1.3.1) rubocop (= 0.47.1) diff-lcs (1.3) erubis (2.7.0) - faraday (0.14.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.10.0) ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) - hashie (3.5.5) - highline (1.7.8) - hitimes (1.2.6) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashie (3.6.0) + highline (1.7.10) httpclient (2.8.3) iniparse (1.4.4) ipaddress (0.8.3) - json (2.1.0) - knife-solo (0.7.0.pre3) + knife-solo (0.7.0) chef (>= 10.20) erubis (~> 2.7.0) net-ssh (>= 2.7) knife-solo_data_bag (2.1.0) libyajl2 (1.2.0) - minitar (0.6.1) - mixlib-archive (0.4.1) - mixlib-log - mixlib-authentication (1.4.1) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + minitar (0.8) + mixlib-archive (0.4.19) mixlib-log + mixlib-authentication (2.1.1) mixlib-cli (1.7.0) - mixlib-config (2.2.4) - mixlib-install (2.1.12) - artifactory + mixlib-config (2.2.18) + tomlrb + mixlib-install (3.11.5) mixlib-shellout mixlib-versioning thor - mixlib-log (1.7.1) - mixlib-shellout (2.2.7) - mixlib-versioning (1.1.0) - molinillo (0.6.5) - multi_json (1.12.1) + mixlib-log (2.0.9) + mixlib-shellout (2.4.4) + mixlib-versioning (1.2.7) + molinillo (0.6.6) + multi_json (1.13.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -129,66 +119,48 @@ GEM net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) - nio4r (2.3.0) - octokit (4.8.0) + nori (2.6.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.24.1) - chef-config (>= 12.5.0.alpha.1, < 14) + ohai (14.8.10) + chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress - mixlib-cli + mixlib-cli (>= 1.7.0) mixlib-config (~> 2.0) - mixlib-log (>= 1.7.1, < 2.0) + mixlib-log (~> 2.0, >= 2.0.1) mixlib-shellout (~> 2.0) plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) parser (2.4.0.0) ast (~> 2.2) - plist (3.3.0) + plist (3.5.0) powerpack (0.1.1) proxifier (1.0.3) - public_suffix (2.0.5) - rack (2.0.3) + public_suffix (3.0.3) + rack (2.0.6) rainbow (2.2.2) rake rake (12.0.0) retryable (2.0.4) - ridley (5.1.1) - addressable - buff-config (~> 2.0) - buff-extensions (~> 2.0) - buff-ignore (~> 1.2) - buff-shell_out (~> 1.0) - celluloid (~> 0.16.0) - celluloid-io (~> 0.16.1) - chef-config (>= 12.5.0) - erubis - faraday (~> 0.9) - hashie (>= 2.0.2, < 4.0.0) - httpclient (~> 2.7) - json (>= 1.7.7) - mixlib-authentication (>= 1.3.0) - retryable (~> 2.0) - semverse (~> 2.0) - varia_model (~> 0.6) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) + rspec-support (~> 3.8.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.6.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) @@ -199,55 +171,71 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) - safe_yaml (1.0.4) + rubyntlm (0.6.2) + rubyzip (1.2.2) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - semverse (2.0.0) - serverspec (2.39.1) + semverse (3.0.0) + serverspec (2.41.3) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.68) + specinfra (~> 2.72) sfl (2.3) - solve (4.0.0) + solve (4.0.2) molinillo (~> 0.6) - semverse (>= 1.1, < 3.0) - specinfra (2.68.1) + semverse (>= 1.1, < 4.0) + specinfra (2.76.9) net-scp - net-ssh (>= 2.7, < 5.0) - net-telnet + net-ssh (>= 2.7) + net-telnet (= 0.1.1) sfl syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.16.0) - mixlib-install (>= 1.2, < 3.0) + test-kitchen (1.24.0) + mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) - safe_yaml (~> 1.0) - thor (~> 0.19, < 0.19.2) - thor (0.19.1) - timers (4.0.4) - hitimes + thor (~> 0.19) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.1) + thor (0.20.3) + tomlrb (1.2.8) unicode-display_width (1.2.1) uuidtools (2.1.5) - varia_model (0.6.0) - buff-extensions (~> 2.0) - hashie (>= 2.0.2, < 4.0.0) - wmi-lite (1.0.0) + winrm (2.3.1) + builder (>= 2.1.2) + erubis (~> 2.7) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-elevated (1.1.1) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) + wmi-lite (1.0.2) PLATFORMS ruby DEPENDENCIES - berkshelf (~> 6.3) - chef (~> 12.21.1) + berkshelf (~> 7.0) + chef (~> 14.9.13) cookstyle - knife-solo (>= 0.7.0.pre3) + knife-solo (~> 0.7.0) knife-solo_data_bag test-kitchen BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/cookbooks/composer/metadata.rb b/cookbooks/composer/metadata.rb new file mode 100644 index 0000000..4cc7da0 --- /dev/null +++ b/cookbooks/composer/metadata.rb @@ -0,0 +1,23 @@ +name 'composer' +maintainer 'David Joos' +maintainer_email 'development@davidjoos.com' +license 'MIT' +description 'Installs/Configures Composer' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '2.6.1' + +%w(debian ubuntu redhat centos fedora scientific amazon windows).each do |os| + supports os +end + +source_url 'https://github.com/djoos-cookbooks/composer' if respond_to?(:source_url) +issues_url 'https://github.com/djoos-cookbooks/composer/issues' if respond_to?(:issues_url) + +depends 'apt' +depends 'php' +depends 'windows' + +recipe 'composer', 'Installs (if applicable) and self-updates composer.' +recipe 'composer::install', 'Installs composer.' +recipe 'composer::self_update', 'Installs (if applicable) and self-updates composer.' +recipe 'composer::global_configs', 'Sets up global config options via `composer config --global`' diff --git a/cookbooks/hostname/metadata.rb b/cookbooks/hostname/metadata.rb new file mode 100644 index 0000000..8355ea1 --- /dev/null +++ b/cookbooks/hostname/metadata.rb @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- + +name 'hostname' +maintainer 'Maciej Pasternacki' +maintainer_email 'maciej@3ofcoins.net' +license 'MIT' +description 'Configures hostname and FQDN' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '0.4.2' + +supports 'debian' +supports 'ubuntu' +supports 'freebsd' + +depends 'hostsfile' + +source_url 'https://github.com/3ofcoins/chef-cookbook-hostname' if respond_to?(:source_url) +issues_url 'https://github.com/3ofcoins/chef-cookbook-hostname/issues' if respond_to?(:issues_url) + +chef_version '>= 12.1' if respond_to?(:chef_version) diff --git a/cookbooks/hostsfile/metadata.rb b/cookbooks/hostsfile/metadata.rb new file mode 100644 index 0000000..5474e5d --- /dev/null +++ b/cookbooks/hostsfile/metadata.rb @@ -0,0 +1,7 @@ +name 'hostsfile' +maintainer 'Seth Vargo' +maintainer_email 'sethvargo@gmail.com' +license 'Apache 2.0' +description 'Provides an LWRP for managing the /etc/hosts file' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '2.4.5' diff --git a/cookbooks/ipfs/README.md b/cookbooks/ipfs/README.md index 7d1d5f1..4970296 100644 --- a/cookbooks/ipfs/README.md +++ b/cookbooks/ipfs/README.md @@ -12,8 +12,8 @@ It currently only supports 64bit platforms ### Chef - Chef 12.5 or later (we are providing a - [https://docs.chef.io/custom_resources.html](Custom Resource) to configure - IPFS + [Custom Resource](https://docs.chef.io/custom_resources.html) to configure + IPFS) ### Cookbook dependencies diff --git a/cookbooks/ipfs/metadata.json b/cookbooks/ipfs/metadata.json index 49820a9..38b5888 100644 --- a/cookbooks/ipfs/metadata.json +++ b/cookbooks/ipfs/metadata.json @@ -1,7 +1,7 @@ { "name": "ipfs", "description": "Installs/Configures ipfs", - "long_description": "# ipfs Cookbook\n\nThis cookbook installs ipfs and starts it as a daemon\n\n## Requirements\n\n### Platforms\n\nThis cookbook is tested on Ubuntu 16.06, 14.04 and Debian 8 using Test Kitchen.\nIt currently only supports 64bit platforms\n\n### Chef\n\n- Chef 12.5 or later (we are providing a\n [https://docs.chef.io/custom_resources.html](Custom Resource) to configure\n IPFS\n\n### Cookbook dependencies\n\n- `ark` to download and uncompress the Go IPFS package\n\n## Usage\n\n### ipfs::default\n\nJust include `ipfs` in your node's `run_list`:\n\n```json\n{\n \"name\":\"my_node\",\n \"run_list\": [\n \"recipe[ipfs]\"\n ]\n}\n```\n\n## Attributes\n\n- `node.['ipfs']['version']` - the Go IPFS version to download from the official\nsite (64bit)\n- `node['ipfs']['checksum']` - the SHA256 checksum for the package\n- `node['ipfs']['config']['swarm']['addr_filter']` - the network ranges to not\nconnect to. This will stop platforms like Hetzner to block your server\n(https://github.com/ipfs/go-ipfs/issues/1226)\n\n## Resources\n\n`ipfs_config` sets the config. Supports hashes, arrays, booleans and strings.\nDoes not change anything if the config already has that value, and restarts\nthe server automatically\n\n```ruby\nipfs_config \"Gateway.Writable\" do\n value \"true\"\n end\n```\n\n## Running the specs and integrations tests\n\nInstall the latest [Chef DK](https://downloads.chef.io/chefdk).\n\n```\nchef exec delivery local all # Run the linting check, syntax check and unit tests\nkitchen verify # Run the integration tests for Ubuntu 16.04, 18.06 and Debian 9\n```\n\n## License and Authors\n\nAuthors: Kosmos Developers mail@kosmos.org\nCopyright: 2018, [Kosmos Developers](https://kredits.kosmos.org/)\n\n```\nUnless otherwise noted, all files are released under the MIT license, possible\nexceptions will contain licensing information in them.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n```\n", + "long_description": "# ipfs Cookbook\n\nThis cookbook installs ipfs and starts it as a daemon\n\n## Requirements\n\n### Platforms\n\nThis cookbook is tested on Ubuntu 16.06, 14.04 and Debian 8 using Test Kitchen.\nIt currently only supports 64bit platforms\n\n### Chef\n\n- Chef 12.5 or later (we are providing a\n [Custom Resource](https://docs.chef.io/custom_resources.html) to configure\n IPFS)\n\n### Cookbook dependencies\n\n- `ark` to download and uncompress the Go IPFS package\n\n## Usage\n\n### ipfs::default\n\nJust include `ipfs` in your node's `run_list`:\n\n```json\n{\n \"name\":\"my_node\",\n \"run_list\": [\n \"recipe[ipfs]\"\n ]\n}\n```\n\n## Attributes\n\n- `node.['ipfs']['version']` - the Go IPFS version to download from the official\nsite (64bit)\n- `node['ipfs']['checksum']` - the SHA256 checksum for the package\n- `node['ipfs']['config']['swarm']['addr_filter']` - the network ranges to not\nconnect to. This will stop platforms like Hetzner to block your server\n(https://github.com/ipfs/go-ipfs/issues/1226)\n\n## Resources\n\n`ipfs_config` sets the config. Supports hashes, arrays, booleans and strings.\nDoes not change anything if the config already has that value, and restarts\nthe server automatically\n\n```ruby\nipfs_config \"Gateway.Writable\" do\n value \"true\"\n end\n```\n\n## Running the specs and integrations tests\n\nInstall the latest [Chef DK](https://downloads.chef.io/chefdk).\n\n```\nchef exec delivery local all # Run the linting check, syntax check and unit tests\nkitchen verify # Run the integration tests for Ubuntu 16.04, 18.06 and Debian 9\n```\n\n## License and Authors\n\nAuthors: Kosmos Developers mail@kosmos.org\nCopyright: 2018, [Kosmos Developers](https://kredits.kosmos.org/)\n\n```\nUnless otherwise noted, all files are released under the MIT license, possible\nexceptions will contain licensing information in them.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n```\n", "maintainer": "Kosmos Developers", "maintainer_email": "mail@kosmos.org", "license": "MIT", @@ -11,23 +11,16 @@ "dependencies": { "ark": ">= 0.0.0" }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, "providing": { - }, - "replacing": { + }, "attributes": { - }, - "groupings": { + }, "recipes": { + }, - "version": "0.1.0", + "version": "0.1.2", "source_url": "https://github.com/67P/ipfs-cookbook", "issues_url": "https://github.com/67P/ipfs-cookbook/issues", "privacy": false, @@ -42,4 +35,4 @@ "gems": [ ] -} \ No newline at end of file +} diff --git a/cookbooks/ipfs/metadata.rb b/cookbooks/ipfs/metadata.rb new file mode 100644 index 0000000..033dc45 --- /dev/null +++ b/cookbooks/ipfs/metadata.rb @@ -0,0 +1,15 @@ +name 'ipfs' +maintainer 'Kosmos Developers' +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.2' + +supports %w(ubuntu debian) + +depends 'ark' + +source_url 'https://github.com/67P/ipfs-cookbook' +issues_url 'https://github.com/67P/ipfs-cookbook/issues' +chef_version '>= 12.14' if respond_to?(:chef_version) diff --git a/cookbooks/ipfs/recipes/_user.rb b/cookbooks/ipfs/recipes/_user.rb index 3614d42..6278513 100644 --- a/cookbooks/ipfs/recipes/_user.rb +++ b/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 diff --git a/cookbooks/ipfs/templates/default/ipfs-cluster.initd.service.erb b/cookbooks/ipfs/templates/default/ipfs-cluster.initd.service.erb index 1b8c2ff..a301208 100644 --- a/cookbooks/ipfs/templates/default/ipfs-cluster.initd.service.erb +++ b/cookbooks/ipfs/templates/default/ipfs-cluster.initd.service.erb @@ -15,7 +15,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin DESC="ipfs-cluster daemon" NAME=ipfs-cluster DAEMON=/usr/local/bin/ipfs-cluster-service -DAEMON_ARGS="daemon" +DAEMON_ARGS="daemon --upgrade" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME diff --git a/cookbooks/ipfs/templates/default/ipfs-cluster.systemd.service.erb b/cookbooks/ipfs/templates/default/ipfs-cluster.systemd.service.erb index 08bf2f0..74dc402 100644 --- a/cookbooks/ipfs/templates/default/ipfs-cluster.systemd.service.erb +++ b/cookbooks/ipfs/templates/default/ipfs-cluster.systemd.service.erb @@ -2,7 +2,7 @@ Description=Start ipfs-cluster [Service] -ExecStart=/usr/local/bin/ipfs-cluster-service daemon +ExecStart=/usr/local/bin/ipfs-cluster-service daemon --upgrade User=ipfs Group=ipfs Restart=always diff --git a/cookbooks/logrotate/metadata.rb b/cookbooks/logrotate/metadata.rb new file mode 100644 index 0000000..e0899fc --- /dev/null +++ b/cookbooks/logrotate/metadata.rb @@ -0,0 +1,18 @@ +name 'logrotate' +maintainer 'Steven Danna' +maintainer_email 'steve@chef.io' +license 'Apache 2.0' +description 'Installs logrotate package and provides a definition for logrotate configs' +long_description 'Installs the logrotate package, manages /etc/logrotate.conf, and provides a logrotate_app definition.' +version '2.2.0' + +recipe 'logrotate', 'Installs logrotate package' +provides 'logrotate_app' + +%w(amazon centos debian fedora redhat scientific solaris2 ubuntu).each do |platform| + supports platform +end + +source_url 'https://github.com/stevendanna/logrotate' +issues_url 'https://github.com/stevendanna/logrotate/issues' +chef_version '>= 12.5' if respond_to?(:chef_version) diff --git a/cookbooks/mediawiki/metadata.json b/cookbooks/mediawiki/metadata.json index 2128705..c5923ce 100644 --- a/cookbooks/mediawiki/metadata.json +++ b/cookbooks/mediawiki/metadata.json @@ -3,7 +3,7 @@ "description": "Installs/Configures mediawiki", "long_description": "Installs/Configures mediawiki", "maintainer": "pulsation", - "maintainer_email": "YOUR_EMAIL", + "maintainer_email": "", "license": "BSD", "platforms": { "centos": ">= 0.0.0", @@ -18,15 +18,8 @@ "mysql2_chef_gem": ">= 0.0.0", "php-fpm": ">= 0.0.0" }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, "providing": { - }, - "replacing": { + }, "attributes": { "mediawiki/version": { @@ -126,8 +119,6 @@ ] } }, - "groupings": { - }, "recipes": { "mediawiki::default": "Installs/Configures mediawiki" }, @@ -144,4 +135,4 @@ "gems": [ ] -} \ No newline at end of file +} diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb new file mode 100644 index 0000000..cafb353 --- /dev/null +++ b/cookbooks/mediawiki/metadata.rb @@ -0,0 +1,59 @@ +name 'mediawiki' +maintainer 'pulsation' +license 'BSD' +description 'Installs/Configures mediawiki' +long_description 'Installs/Configures mediawiki' +version '0.3.0' + +depends 'apache2' +depends 'php' +depends 'mysql' +depends 'database' +depends 'chef_nginx' +depends 'mysql2_chef_gem' +depends 'php-fpm' + +attribute 'mediawiki/version', + :display_name => "Mediawiki version", + :type => "string", + :required => "recommended" + +attribute 'mediawiki/database/name', + :display_name => "Database name", + :type => "string", + :required => "optional" + +attribute 'mediawiki/database/user', + :display_name => "Database user", + :type => "string", + :required => "optional" + +attribute 'mediawiki/database/password', + :display_name => "Database password", + :type => "string", + :required => "optional" + +attribute 'mediawiki/server_name', + :display_name => "Server name", + :type => "string", + :required => "recommended" + +attribute 'mediawiki/sciptpath', + :display_name => "Script path", + :type => "string", + :required => "optional" + +attribute 'mediawiki/admin_user', + :display_name => "Admin user", + :type => "string", + :required => "recommended" + +attribute 'mediawiki/admin_password', + :display_name => "Admin password", + :type => "string", + :required => "recommended" + +recipe "mediawiki::default", "Installs/Configures mediawiki" + +supports "centos" +supports "debian" diff --git a/cookbooks/rbac/metadata.rb b/cookbooks/rbac/metadata.rb new file mode 100644 index 0000000..91c58d2 --- /dev/null +++ b/cookbooks/rbac/metadata.rb @@ -0,0 +1,10 @@ +name 'rbac' +maintainer 'Eric Saxby' +maintainer_email 'sax@livinginthepast.org' +license 'MIT' +description 'Allows delegation of service management to users with Solaris Role Based Access Control (RBAC)' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '1.0.3' + +supports 'solaris2' +supports 'smartos' diff --git a/cookbooks/redis/metadata.json b/cookbooks/redis/metadata.json index f96c463..352fb4e 100644 --- a/cookbooks/redis/metadata.json +++ b/cookbooks/redis/metadata.json @@ -12,19 +12,11 @@ "dependencies": { "apt": ">= 0.0.0" }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, "providing": { - }, - "replacing": { + }, "attributes": { - }, - "groupings": { + }, "recipes": { "redis::default": "Sets up ppa apt repository", @@ -44,4 +36,4 @@ "gems": [ ] -} \ No newline at end of file +} diff --git a/cookbooks/redis/metadata.rb b/cookbooks/redis/metadata.rb new file mode 100644 index 0000000..d67a2c7 --- /dev/null +++ b/cookbooks/redis/metadata.rb @@ -0,0 +1,15 @@ +name "redis" +maintainer "Phil Cohen" +maintainer_email "github@phlippers.net" +license "MIT" +description "Installs and configures Redis" +version "0.5.6" + +recipe "redis::default", "Sets up ppa apt repository" +recipe "redis::server", "Installs redis server" +recipe "redis::client", "Installs redis client" + +supports "debian" +supports "ubuntu" + +depends "apt" diff --git a/cookbooks/smf/metadata.rb b/cookbooks/smf/metadata.rb new file mode 100644 index 0000000..94a4751 --- /dev/null +++ b/cookbooks/smf/metadata.rb @@ -0,0 +1,13 @@ +name 'smf' +maintainer 'Eric Saxby' +maintainer_email 'sax@livinginthepast.org' +license 'MIT' +description 'A light weight resource provider (LWRP) for SMF (Service Management Facility)' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '2.2.8' + +supports 'smartos' + +depends 'rbac', '>= 1.0.1' + +suggests 'resource-control' # For managing Solaris projects, when setting project on a manifest diff --git a/cookbooks/timezone_iii/metadata.rb b/cookbooks/timezone_iii/metadata.rb new file mode 100644 index 0000000..06c7ed6 --- /dev/null +++ b/cookbooks/timezone_iii/metadata.rb @@ -0,0 +1,27 @@ +name 'timezone_iii' +maintainer 'Corey Hemminger' +maintainer_email 'hemminger@hotmail.com' +license 'Apache-2.0' +description 'Configures the timezone for node' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '1.0.4' +chef_version '>= 12.1' if respond_to?(:chef_version) + +# The `issues_url` points to the location where issues for this cookbook are +# tracked. A `View Issues` link will be displayed on this cookbook's page when +# uploaded to a Supermarket. +# +issues_url 'https://github.com/Stromweld/timezone_iii/issues' + +# The `source_url` points to the development reposiory for this cookbook. A +# `View Source` link will be displayed on this cookbook's page when uploaded to +# a Supermarket. +# +source_url 'https://github.com/Stromweld/timezone_iii' + +%w(amazon centos debian fedora gentoo ubuntu pld redhat windows).each do |os| + supports os +end + +replaces 'timezone' +replaces 'timezone-ii' diff --git a/cookbooks/wordpress/metadata.json b/cookbooks/wordpress/metadata.json index 7af75af..bb0ee87 100644 --- a/cookbooks/wordpress/metadata.json +++ b/cookbooks/wordpress/metadata.json @@ -19,7 +19,7 @@ "openssl": ">= 0.0.0", "apache2": ">= 2.0.0", "database": ">= 1.6.0", - "mysql": ">= 6.0.0", + "mysql": ">= 6.0", "mysql2_chef_gem": ">= 1.0.1", "build-essential": ">= 0.0.0", "iis": ">= 1.6.2", @@ -28,15 +28,8 @@ "php-fpm": ">= 0.0.0", "selinux": "~> 0.7" }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, "providing": { - }, - "replacing": { + }, "attributes": { "WordPress/version": { @@ -241,8 +234,6 @@ ] } }, - "groupings": { - }, "recipes": { "WordPress": "Installs and configures WordPress LAMP stack on a single system", "WordPress::languages": "Install WordPress translation files" @@ -260,4 +251,4 @@ "gems": [ ] -} \ No newline at end of file +} diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb new file mode 100644 index 0000000..603c779 --- /dev/null +++ b/cookbooks/wordpress/metadata.rb @@ -0,0 +1,100 @@ +name "wordpress" +maintainer "Brint O'Hearn" +maintainer_email "cookbooks@opscode.com" +license "Apache 2.0" +description "Installs/Configures WordPress" +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version "3.1.0" + +recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" +recipe "WordPress::languages", "Install WordPress translation files" + +%w{ php openssl }.each do |cb| + depends cb +end + +depends "apache2", ">= 2.0.0" +depends "database", ">= 1.6.0" +depends "mysql", ">= 6.0" +depends "mysql2_chef_gem", ">= 1.0.1" +depends "build-essential" +depends "iis", ">= 1.6.2" +depends "tar", ">= 0.3.1" +depends "chef_nginx" +depends "php-fpm" +depends 'selinux', '~> 0.7' + +%w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| + supports os +end + +attribute "WordPress/version", + :display_name => "WordPress download version", + :description => "Version of WordPress to download from the WordPress site or 'latest' for the current release.", + :default => "latest" + +attribute "WordPress/checksum", + :display_name => "WordPress tarball checksum", + :description => "Checksum of the tarball for the version specified.", + :default => "" + +attribute "WordPress/dir", + :display_name => "WordPress installation directory", + :description => "Location to place WordPress files.", + :default => "/var/www/wordpress" + +attribute "WordPress/db/database", + :display_name => "WordPress MySQL database", + :description => "WordPress will use this MySQL database to store its data.", + :default => "wordpressdb" + +attribute "WordPress/db/user", + :display_name => "WordPress MySQL user", + :description => "WordPress will connect to MySQL using this user.", + :default => "wordpressuser" + +attribute "WordPress/db/password", + :display_name => "WordPress MySQL password", + :description => "Password for the WordPress MySQL user.", + :default => "randomly generated" + +attribute "WordPress/keys/auth", + :display_name => "WordPress auth key", + :description => "WordPress auth key.", + :default => "randomly generated" + +attribute "WordPress/keys/secure_auth", + :display_name => "WordPress secure auth key", + :description => "WordPress secure auth key.", + :default => "randomly generated" + +attribute "WordPress/keys/logged_in", + :display_name => "WordPress logged-in key", + :description => "WordPress logged-in key.", + :default => "randomly generated" + +attribute "WordPress/keys/nonce", + :display_name => "WordPress nonce key", + :description => "WordPress nonce key.", + :default => "randomly generated" + +attribute "WordPress/server_aliases", + :display_name => "WordPress Server Aliases", + :description => "WordPress Server Aliases", + :default => "FQDN" + +attribute "WordPress/languages/lang", + :display_name => "WordPress WPLANG configulation value", + :description => "WordPress WPLANG configulation value", + :default => "" + +attribute "WordPress/languages/version", + :display_name => "Version of WordPress translation file", + :description => "Version of WordPress translation file", + :default => "" + +attribute "WordPress/languages/projects", + :display_name => "WordPress translation projects", + :description => "WordPress translation projects", + :type => "array", + :default => ["main", "admin", "admin/network", "cc"] diff --git a/cookbooks/yum-epel/metadata.rb b/cookbooks/yum-epel/metadata.rb new file mode 100644 index 0000000..3b9958b --- /dev/null +++ b/cookbooks/yum-epel/metadata.rb @@ -0,0 +1,9 @@ +name 'yum-epel' +maintainer 'Chef' +maintainer_email 'Sean OMeara ' +license 'Apache 2.0' +description 'Installs/Configures yum-epel' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version '0.3.6' + +depends 'yum', '~> 3.0' diff --git a/site-cookbooks/backup/recipes/default.rb b/site-cookbooks/backup/recipes/default.rb index 8d34348..d62b6cb 100644 --- a/site-cookbooks/backup/recipes/default.rb +++ b/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') diff --git a/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb b/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb index 6b5c459..48ad26e 100644 --- a/site-cookbooks/kosmos-base/recipes/andromeda_firewall.rb +++ b/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 diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb index e9b4f6b..3eb9433 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb +++ b/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 diff --git a/site-cookbooks/kosmos-ipfs/recipes/cluster.rb b/site-cookbooks/kosmos-ipfs/recipes/cluster.rb index cf23b7f..128fca5 100644 --- a/site-cookbooks/kosmos-ipfs/recipes/cluster.rb +++ b/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" diff --git a/site-cookbooks/kosmos-ipfs/recipes/default.rb b/site-cookbooks/kosmos-ipfs/recipes/default.rb index adf4853..12aad8e 100644 --- a/site-cookbooks/kosmos-ipfs/recipes/default.rb +++ b/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 diff --git a/site-cookbooks/kosmos-mastodon/recipes/default.rb b/site-cookbooks/kosmos-mastodon/recipes/default.rb index 9a0273a..54e93df 100644 --- a/site-cookbooks/kosmos-mastodon/recipes/default.rb +++ b/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') diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index cf37b16..009e019 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/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"]