capistrano-cluster 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d28ece80a04cd0257e5f97a30d46ceeddfbb109
-  data.tar.gz: 295470587952175f419e1ad53bbd8946eee57777
+  metadata.gz: 582a0aca1110d970d05c17cc9645c922f8a335ea
+  data.tar.gz: 0d09299b7a5778be2f35fcd6b9f6937995b4abe8
 SHA512:
-  metadata.gz: ecf82851ea29275807ae1dadb5987c828305948cdca1b01ceb2d85db0788ed8d272583088307f0a0f8a8af3196f082f3cc02b4f97942ab5d786f1ce7ad630cc0
-  data.tar.gz: 3c8a45f2cd05e6aa49af4d88f936ea2b4587eea90ff83621d2ebb4cbbdcceb8fc7505b2bac39c8becbd53e8c0d187ffddc09e872282e51880f9cfa116fb197f6
+  metadata.gz: 512956f45f74ef798bdfd70496a95e269f8d5059d98ba87962a3a8cd9a63074d4558216199e3ebe74b0ddc11d0345b5a190ed0ddb42ca81408bc9dcd2e1407a7
+  data.tar.gz: 35e80d4956ba3b8e6010dc4b5a02fc28f59e23f8bfbf28dcadd36bafe9badb8992b619a740965027f8a4c1e79873fa21425052adc770320bfb135a1f1b0a8043

data/dummy/Capfile.rb

@@ -0,0 +1,24 @@
+module CapFile #:nodoc:
+end
+
+require "capistrano/cluster"
+
+set :stage, :development
+set :user, :deploy
+
+set :format, :pretty
+set :log_level, :debug
+set :pty, true
+
+set :ssh_options,
+  forward_agent: true,
+  user: "deploy",
+  paranoid: true
+
+server "192.168.50.11", roles: %w[proxy], no_release: true, user: "deploy"
+server "192.168.50.12", roles: %w[proxy], no_release: true, user: "deploy"
+server "192.168.50.13", roles: %w[app web], no_release: true, user: "deploy"
+
+set :deploy_keys, [
+  "ssh-dss AAAAB3NzaC1kc3MAAACBAMLKdDOr2nexZgTV0S5ZFcLfJ/wc1BdZbo2rFq+iohacaON2enQFAR+ldfQVwWzaVAhAPLc4xqOap/ljkNQDqboz+TXLuqFvVv4pNg98AZ5puIaCMjKTc1SwUOsGBBIPE3UIK4hemZc6qT7R++pboBBs9harZvXCaMn70ddT2il7AAAAFQD2ns7a9C7G6FIJ4x5yqlirDilvvQAAAIEAgIOmRX/zzPnQic+cCZaMcMAcMGEFt20xs8/DQ26ZhU65RESlCNOThMyzb8YcVER1f+9jdCnKgA5ZXRsnee+oD4A3Fsf5ab9lb3uQBhkUFyyunAkVA4QmU/XAhv2PHbpQC/FdIu0Z4EtupYIMMg5Gfbp61oRHbjA3qpASW7lxSEkAAACBAIJ1urC06ijX2k5lOQtQAPTkmIf6BpViUSeZjX8+beY24F9p5ZTdeovx+x/K9Im/XuFN2MkcH6skJ4K8iR1ALPYEyhRC3BtDAx1bNB5CupqL5053rsR68h/fqthN4ADLnun70Fvkt0gznN30rLe+lD6PDqQjCpZ4z2p07eZ33Rw4"
+]

data/dummy/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "capistrano-cluster", path: "../"

data/dummy/Vagrantfile.rb

@@ -0,0 +1,21 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provider "virtualbox" do |vb|
+    vb.memory = "1024"
+  end
+
+  1.upto(3).each do |i|
+    config.vm.define "box-#{i}" do |box|
+      box.vm.hostname = "box-#{i}"
+      box.vm.network "private_network", ip: "192.168.50.1#{i}"
+    end
+  end
+
+  config.vm.provision :shell, inline: <<-SH
+  FILE="/root/.ssh/authorized_keys"
+  mkdir -p $(dirname "${FILE}")
+  grep "verestiuc.vlad@gmail.com" "${FILE}" || echo "ssh-dss AAAAB3NzaC1kc3MAAACBAMLKdDOr2nexZgTV0S5ZFcLfJ/wc1BdZbo2rFq+iohacaON2enQFAR+ldfQVwWzaVAhAPLc4xqOap/ljkNQDqboz+TXLuqFvVv4pNg98AZ5puIaCMjKTc1SwUOsGBBIPE3UIK4hemZc6qT7R++pboBBs9harZvXCaMn70ddT2il7AAAAFQD2ns7a9C7G6FIJ4x5yqlirDilvvQAAAIEAgIOmRX/zzPnQic+cCZaMcMAcMGEFt20xs8/DQ26ZhU65RESlCNOThMyzb8YcVER1f+9jdCnKgA5ZXRsnee+oD4A3Fsf5ab9lb3uQBhkUFyyunAkVA4QmU/XAhv2PHbpQC/FdIu0Z4EtupYIMMg5Gfbp61oRHbjA3qpASW7lxSEkAAACBAIJ1urC06ijX2k5lOQtQAPTkmIf6BpViUSeZjX8+beY24F9p5ZTdeovx+x/K9Im/XuFN2MkcH6skJ4K8iR1ALPYEyhRC3BtDAx1bNB5CupqL5053rsR68h/fqthN4ADLnun70Fvkt0gznN30rLe+lD6PDqQjCpZ4z2p07eZ33Rw4 Verestiuc Vlad Ovidiu <verestiuc.vlad@gmail.com>" > "${FILE}"
+  chmod 644 "${FILE}"
+  SH
+end

data/files/pg_hba.conf.erb

@@ -6,5 +6,5 @@ local   replication     postgres                                md5
 host    replication     postgres        127.0.0.1/32            md5
 host    replication     postgres        ::1/128                 md5
 <% allowed_hosts.each do |host| %>
-host    all             all             <%= host%>/32            md5
+host    all             all             <%= Resolv.getaddress(host)%>/32            md5
 <%end %>

data/lib/capistrano/cluster/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Cluster
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

data/tasks/roles/db.rake

@@ -1,4 +1,7 @@
 # TODO: (vvlad): tune using pgtune
+
+Kernel::require('resolv')
+
 namespace :setup do
   task :db do
     on roles(:db) do

data/tasks/roles/indexer.rake

@@ -61,6 +61,7 @@ namespace :deploy do
             upload! file("solr/#{core_file}"), "#{solr_data}/#{config[:name]}/#{core_file}"
           end
           execute :touch, "#{solr_data}/#{config[:name]}/core.properties"
+          sudo "nohup /etc/init.d/solr reload"
         end
       end if config[:name]
     end

data/tasks/roles/pg_pool.rake

@@ -0,0 +1,4 @@
+namespace :db do
+  namespace :pg_tool do
+  end
+end

data/tasks/setup/firewall.rake

@@ -1,3 +1,4 @@
+Kernel::require('resolv')
 namespace :setup do
 
   task :firewall do
@@ -13,25 +14,25 @@ namespace :setup do
 
     on roles(:db) do
       roles(:app).each do |server|
-        ufw :allow, "proto tcp from #{server.hostname} to any port postgresql"
+        ufw :allow, "proto tcp from #{Resolv.getaddress server.hostname} to any port postgresql"
       end
     end
 
     on roles(:indexer) do
       roles(:app).each do |server|
-        ufw :allow, "proto tcp from #{server.hostname} to any port 8983"
+        ufw :allow, "proto tcp from #{Resolv.getaddress server.hostname} to any port 8983"
       end
     end
 
     on roles(:cache) do
       roles(:app).each do |server|
-        ufw :allow, "proto tcp from #{server.hostname} to any port 6379"
+        ufw :allow, "proto tcp from #{Resolv.getaddress server.hostname} to any port 6379"
       end
     end
 
     on roles(:web) do
       roles(:proxy).each do |server|
-        ufw :allow, "proto tcp from #{server.hostname} to any port http"
+        ufw :allow, "proto tcp from #{Resolv.getaddress server.hostname} to any port http"
       end
     end
 
@@ -49,5 +50,4 @@ namespace :setup do
 
 end
 
-
 before "setup:finished", "setup:firewall"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Vlad Verestiuc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,9 @@ files:
 - README.md
 - Rakefile
 - capistrano-cluster.gemspec
+- dummy/Capfile.rb
+- dummy/Gemfile
+- dummy/Vagrantfile.rb
 - files/Procfile.erb
 - files/apt.conf.d/10periodic
 - files/apt.conf.d/50unattended-upgrades
@@ -188,6 +191,7 @@ files:
 - tasks/roles/db.rake
 - tasks/roles/indexer.rake
 - tasks/roles/mongodb.rake
+- tasks/roles/pg_pool.rake
 - tasks/roles/proxy.rake
 - tasks/roles/rabbit.rake
 - tasks/roles/resque.rake
@@ -215,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Environment setup automation.