diff --git a/Gemfile.lock b/Gemfile.lock index e1f7395c..5f8e8691 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,10 +2,10 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - artifactory (2.5.1) + artifactory (2.7.0) ast (2.3.0) backports (3.6.8) - berkshelf (5.3.0) + berkshelf (5.6.3) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) buff-config (~> 2.0) @@ -15,7 +15,7 @@ GEM faraday (~> 0.9) httpclient (~> 2.7) minitar (~> 0.5, >= 0.5.4) - mixlib-archive (~> 0.1) + mixlib-archive (~> 0.4) octokit (~> 4.0) retryable (~> 2.0) ridley (~> 5.0) @@ -25,7 +25,7 @@ GEM faraday (~> 0.9) httpclient (~> 2.7) ridley (>= 4.5, < 6.0) - brakeman (3.4.1) + brakeman (3.5.0) buff-config (2.0.0) buff-extensions (~> 2.0) varia_model (~> 0.6) @@ -43,25 +43,25 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef (12.17.44) + chef (12.19.36) addressable bundler (>= 1.10) - chef-config (= 12.17.44) + chef-config (= 12.19.36) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - mixlib-archive (>= 0.2.0) + mixlib-archive (~> 0.4) mixlib-authentication (~> 1.4) mixlib-cli (~> 1.7) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 2.9, < 4.0) - net-ssh-multi (~> 1.1) - ohai (>= 8.6.0.alpha.1, < 9) + net-ssh (>= 2.9, < 5.0) + net-ssh-multi (~> 1.2, >= 1.2.1) + ohai (>= 8.6.0.alpha.1, < 13) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -72,18 +72,18 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef-config (12.17.44) + chef-config (12.19.36) addressable fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-zero (5.1.1) + chef-zero (5.3.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack (~> 2.0) uuidtools (~> 2.1) - chefspec (5.3.0) + chefspec (6.0.1) chef (>= 12.0) fauxhai (~> 3.6) rspec (~> 3.0) @@ -91,7 +91,7 @@ GEM ffi (~> 1.0, >= 1.0.11) cleanroom (1.0.0) colorize (0.8.1) - coveralls (0.8.17) + coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) @@ -100,7 +100,7 @@ GEM cucumber-core (2.0.0) backports (~> 3.6) gherkin (~> 4.0) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) erubis (2.7.0) ethon (0.10.1) @@ -117,7 +117,7 @@ GEM ffi (1.9.17) ffi-yajl (2.3.0) libyajl2 (~> 1.2) - foodcritic (8.2.0) + foodcritic (9.0.0) cucumber-core (>= 1.3) erubis nokogiri (>= 1.5, < 2.0) @@ -134,7 +134,7 @@ GEM net-http-persistent (~> 2.9) net-http-pipeline gherkin (4.0.0) - hashie (3.4.6) + hashie (3.5.5) highline (1.7.8) hitimes (1.2.4) httpclient (2.8.3) @@ -143,7 +143,7 @@ GEM json (2.0.3) kitchen-docker (2.6.0) test-kitchen (>= 1.0.0) - kitchen-vagrant (0.21.1) + kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) kramdown (1.13.2) launchy (2.4.3) @@ -154,14 +154,14 @@ GEM mixlib-cli (~> 1.7, >= 1.7.0) mixlib-config (~> 2.2, >= 2.2.1) mini_portile2 (2.1.0) - minitar (0.5.4) - mixlib-archive (0.2.0) + minitar (0.6.1) + mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.1) mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.1.9) + mixlib-install (2.1.12) artifactory mixlib-shellout mixlib-versioning @@ -169,7 +169,7 @@ GEM mixlib-log (1.7.1) mixlib-shellout (2.2.7) mixlib-versioning (1.1.0) - molinillo (0.5.5) + molinillo (0.5.6) multi_json (1.12.1) multipart-post (2.0.0) net-http-persistent (2.9.4) @@ -178,8 +178,8 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (3.2.0) - net-ssh-gateway (1.2.0) + net-ssh (4.1.0) + net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) @@ -190,7 +190,7 @@ GEM mini_portile2 (~> 2.1.0) octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.22.1) + ohai (8.23.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -202,10 +202,10 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - overcommit (0.37.0) + overcommit (0.38.0) childprocess (~> 0.5.8) iniparse (~> 1.4) - parser (2.3.3.1) + parser (2.4.0.0) ast (~> 2.2) plist (3.2.0) polyglot (0.3.5) @@ -255,7 +255,7 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.47.0) + rubocop (0.47.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -275,7 +275,7 @@ GEM rspec (~> 3.0) rspec-its specinfra (~> 2.53) - sexp_processor (4.7.0) + sexp_processor (4.8.0) sfl (2.3) simplecov (0.12.0) docile (~> 1.1.0) @@ -285,7 +285,7 @@ GEM solve (3.1.0) molinillo (>= 0.5) semverse (>= 1.1, < 3.0) - specinfra (2.66.4) + specinfra (2.67.2) net-scp net-ssh (>= 2.7, < 5.0) net-telnet @@ -294,19 +294,19 @@ GEM systemu (2.6.5) term-ansicolor (1.4.0) tins (~> 1.0) - test-kitchen (1.14.2) + test-kitchen (1.15.0) mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) - net-ssh (>= 2.9, < 4.0) - net-ssh-gateway (~> 1.2.0) + net-ssh (>= 2.9, < 5.0) + net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) thor (~> 0.18) thor (0.19.1) timers (4.0.4) hitimes - tins (1.13.0) - travis (1.8.5) + tins (1.13.2) + travis (1.8.6) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -324,7 +324,7 @@ GEM varia_model (0.6.0) buff-extensions (~> 2.0) hashie (>= 2.0.2, < 4.0.0) - websocket (1.2.3) + websocket (1.2.4) wmi-lite (1.0.0) yajl-ruby (1.3.0) @@ -349,4 +349,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.14.3 + 1.14.5 diff --git a/docs/source/attributes.rst b/docs/source/attributes.rst index 258aefec..2d62c248 100644 --- a/docs/source/attributes.rst +++ b/docs/source/attributes.rst @@ -413,7 +413,7 @@ nginx - **Supported values:** ``default`` or ``source`` - **Default:** ``default`` - - The way the `nginx`_ cookbooks handles ``nginx`` installation. + - The way the `chef_nginx`_ cookbook handles ``nginx`` installation. Check out `the corresponding docs`_ for more details. Never use ``node['nginx']['install_method']``, as it will be always overwritten by this attribute. @@ -458,7 +458,7 @@ nginx - **Default**: ``10`` -| Since this driver is basically a wrapper for `nginx cookbook`_, +| Since this driver is basically a wrapper for `chef_nginx cookbook`_, | you can also configure `node['nginx'] attributes`_ | as well (notice that ``node['deploy'][]`` logic | doesn't apply here.) @@ -522,7 +522,7 @@ resque .. _app['webserver']['log_level']: https://httpd.apache.org/docs/2.4/mod/core.html#loglevel .. |app['webserver']['proxy_timeout']| replace:: ``app['webserver']['proxy_timeout']`` .. _app['webserver']['proxy_timeout']: https://httpd.apache.org/docs/current/mod/mod_proxy.html#proxytimeout -.. _nginx: https://supermarket.chef.io/cookbooks/nginx +.. _chef_nginx: https://supermarket.chef.io/cookbooks/chef_nginx .. _the corresponding docs: https://github.com/miketheman/nginx/tree/2.7.x#recipes .. |app['webserver']['client_body_timeout']| replace:: ``app['webserver']['client_body_timeout']`` .. _app['webserver']['client_body_timeout']: http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_timeout @@ -536,7 +536,7 @@ resque .. _app['webserver']['proxy_send_timeout']: http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_send_timeout .. |app['webserver']['send_timeout']| replace:: ``app['webserver']['send_timeout']`` .. _app['webserver']['send_timeout']: http://nginx.org/en/docs/http/ngx_http_core_module.html#send_timeout -.. _nginx cookbook: https://github.com/miketheman/nginx/tree/2.7.x +.. _chef_nginx cookbook: https://github.com/chef-cookbooks/chef_nginx .. |node['nginx'] attributes| replace:: ``node['nginx']`` attributes .. _node['nginx'] attributes: https://github.com/miketheman/nginx/tree/2.7.x#attributes .. |sidekiq.yml config file| replace:: ``sidekiq.yml`` config file diff --git a/docs/source/requirements.rst b/docs/source/requirements.rst index 3b877481..55e8d438 100644 --- a/docs/source/requirements.rst +++ b/docs/source/requirements.rst @@ -6,7 +6,7 @@ Cookbooks - `deployer`_ - `ruby-ng`_ -- `nginx (~> 2.7)`_ +- `chef_nginx`_ Platform -------- diff --git a/libraries/drivers_webserver_nginx.rb b/libraries/drivers_webserver_nginx.rb index a923b08c..15723350 100644 --- a/libraries/drivers_webserver_nginx.rb +++ b/libraries/drivers_webserver_nginx.rb @@ -23,7 +23,7 @@ def raw_out def setup node.default['nginx']['install_method'] = out[:build_type].to_s == 'source' ? 'source' : 'package' recipe = out[:build_type].to_s == 'source' ? 'source' : 'default' - context.include_recipe("nginx::#{recipe}") + context.include_recipe("chef_nginx::#{recipe}") define_service(:start) end diff --git a/metadata.rb b/metadata.rb index 802cb6b8..6f0be132 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,7 +9,7 @@ depends 'deployer' depends 'ruby-ng' -depends 'nginx', '~> 2.7' +depends 'chef_nginx' supports 'amazon', '>= 2015.03' supports 'ubuntu', '>= 12.04'