capistrano-jetty 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfcdf724cf1f519da7dc52c654e588d4c11cb77
-  data.tar.gz: 911459c65597b1da6b96f7935a1626282ed5cca6
+  metadata.gz: b044b2c55e0f2fd99941b44aedcb5cd4d1e5dea5
+  data.tar.gz: b4674156cae9bf0516cf00630f038c856187c85e
 SHA512:
-  metadata.gz: dbd91cf421c5e9e454485095c3d7f136c5c00aec808f6d08eea161146e711e84979969968ac123d8c991afa13e35076512c38f419b94a429618d82a381e3e0be
-  data.tar.gz: 683387ce2291033ebcb4e3cea09550c5b83a573069c0339964acf32f3f27121de091300ec8ca92f17a599dcf7e9722debaf51a17a21fe05b335e6af128f3635b
+  metadata.gz: e875e0f0607bdc723306fa8c778584c3ca407db22614d5d2c578c500785066082a7aeb43323021c5260190c54dc931ec6f0aabae7643bc35a7c673504affaba5
+  data.tar.gz: 064b0f8a9b8e7ca254348d287f22e5e7acdaa4a5a6eacb8dd55547a1e0e3d0db6994b83f3da7a4de2c543931cf9b6630926cacf2089f4fee812210c01856ee12

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This is the Changelog for Capistrano::Jetty.
 
+## v2.0.0 (2016-02-09)
+
+* Remove HAProxy support
+
 ## v1.2.1 (2016-02-09)
 
 * Fix error message for missing variable during validation

data/README.md

@@ -27,6 +27,7 @@ This Gem requires that your deploy user have *passwordless sudo rights* to run
 for a simple example.
 
 In `Capfile`:
+
 ```ruby
 require 'capistrano-jetty/jetty'
 ```
@@ -41,16 +42,6 @@ set :deployed_artifact_filename, "#{fetch(:application)}.war"
 set :jetty_webapps_path, '/usr/share/jetty/webapps'
 ```
 
-In your `config/deploy/(staging|production).rb`, specify the hostname of the HAProxy server(s) and the name of the HAProxy backend for your servers:
-
-```ruby
-server 'prod-api-haproxy-1d', user: fetch(:user), roles: %w{load_balancer}, no_release: true
-
-set :load_balancer_backend, 'contactsapi-prod'
-```
-
-See the [Chef stage environment](https://github.com/evertrue/server-chef/blob/master/environments/stage.json#L141) and [Chef prod environment](https://github.com/evertrue/server-chef/blob/master/environments/prod.json#L232) to find your app’s HAProxy backend. Line numbers may change; search for `backends` in case these links out-of-date.
-
 ## Contributing
 
 1. Fork it ( http://github.com/evertrue/capistrano-jetty/fork )

data/capistrano-jetty.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-jetty'
-  spec.version       = '1.2.1'
+  spec.version       = '2.0.0'
   spec.authors       = ['Jeff Byrnes']
   spec.email         = ['jeff@evertrue.com']
   spec.summary       = %q{Capistrano 3 plugin for handling Jetty.}

data/lib/capistrano-jetty/tasks/jetty.rake

@@ -3,12 +3,10 @@ namespace :deploy do
     on release_roles :all do
       deployed_artifact_filename = fetch(:deployed_artifact_filename)
       jetty_webapps_path         = fetch(:jetty_webapps_path)
-      load_balancer_backend      = fetch(:load_balancer_backend)
 
       %w(
         deployed_artifact_filename
         jetty_webapps_path
-        load_balancer_backend
       ).each do | var_name |
         var = eval(var_name)
 
@@ -21,23 +19,9 @@ namespace :deploy do
     end
   end
 
-  desc 'Rotate servers out of HAProxy pool, stop Jetty, deploy artifact, ' \
-       'restart Jetty, rotate server back into HAProxy pool'
+  desc 'Stop Jetty, deploy artifact, start Jetty'
   task :rolling_restart do
     on roles(:app), in: :sequence, wait: 5 do |server|
-      current_app_server = server.hostname
-
-      on roles(:load_balancer) do
-        execute(
-          :sudo,
-          '/usr/local/bin/haproxyctl',
-          'disable server',
-          "#{fetch(:load_balancer_backend)}/#{current_app_server}"
-        )
-      end
-
-      sleep 3
-
       execute :sudo, :service, 'jetty', 'stop'
 
       execute(
@@ -47,15 +31,6 @@ namespace :deploy do
       )
 
       execute :sudo, :service, 'jetty', 'start'
-
-      on roles(:load_balancer) do
-        execute(
-          :sudo,
-          '/usr/local/bin/haproxyctl',
-          'enable server',
-          "#{fetch(:load_balancer_backend)}/#{current_app_server}"
-        )
-      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-jetty
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeff Byrnes