capistrano3-ubuntu-server-prepare 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 646c4939c01853c066de42c902df577ad0dc29f5
-  data.tar.gz: bc2fd2ceab30ddcfd3de8585a884c600466eb8c9
+  metadata.gz: 583701c11eb0e32240dd49f1173737e8990833f8
+  data.tar.gz: 2f79e06d5b224218dff79da08cf3c2aa8f3a1fba
 SHA512:
-  metadata.gz: e824336cfaaa093c99dfea71567bb63db70abce26e46b71a85259eb1edf94ac4a6ed63daae56b0d7420d1e1743995d7a070022ba577b59168360d93579b5ec32
-  data.tar.gz: 9968f15705710b7c1e239b0360f7caf621fef096ce55ece6a4092033d3344373975722066d5656a2fe10aad566b9671f4c5a7e171d3f77f04279a4581a646283
+  metadata.gz: b7eee19267314b91b0f6c6c163f35785da218064d5f6433a87413ea862e729617143cde068a8563d416f177f8547eb0d6568919d4ed0f14be2f0d9b3f1ef898f
+  data.tar.gz: f6c903187aafb6941240b0b88be073a95686d09797432ddc17b5c8a8ba6296771c05ee1e3b70e21c598ebfba656bae52cbeceeef481dffaa7a54e51a32e5440a

data/capistrano-ubuntu-server-prepare.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano3-ubuntu-server-prepare"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["goooseman"]
   spec.email         = ["inbox@goooseman.ru"]
   spec.summary       = "A task for Capistrano v3 to prepare Ubuntu 14.04 server for first deployment"

data/lib/capistrano3/tasks/ubuntu-server-prepare.rake

@@ -279,113 +279,9 @@ namespace :ubuntu_server_prepare do
             execute "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
             execute "\\curl -sSL https://get.rvm.io | bash -s stable --rails --gems=bundler --autolibs=read-fail"
         end
-<<<<<<< HEAD
-      end
-
-      execute "mkdir -p ~/sources/nginx/conf"
-      user = capture("echo $USER")
-      if fetch :pagespeed_install
-        upload! 'config/production/nginx/nginx_with_pagespeed.conf', "/home/#{user}/sources/nginx/conf/nginx.conf"
-      else
-        upload! 'config/production/nginx/nginx.conf', "/home/#{user}/sources/nginx/conf/nginx.conf"
-      end
-      upload! 'config/production/nginx/upstart.conf', "/home/#{user}/sources/nginx/conf/"
-      execute sudo_command + "cp -f ~/sources/nginx/conf/upstart.conf /etc/init/nginx.conf"
-      execute sudo_command + "cp -f ~/sources/nginx/conf/nginx.conf /usr/local/nginx/conf/nginx.conf"
-      nginx_status = capture(sudo_command + "status nginx")
-      if nginx_status == 'nginx stop/waiting'
-        execute sudo_command + "start nginx"
-      else
-        execute sudo_command + 'restart nginx'
-      end
-=======
->>>>>>> 3b841ddc013973d608456aa8839726cdf98cb11e
     end
 
 
-<<<<<<< HEAD
-      execute sudo_command + "apt-get install -y postgresql-9.3 postgresql-server-dev-9.3"
-      execute sudo_command + "-u postgres psql -c \"create user #{fetch :postgre_username} with password '#{fetch :postgre_password}';\""
-      execute sudo_command + "-u postgres psql -c \"alter role #{fetch :postgre_username} superuser createrole createdb replication;\""
-    end
-  end
-
-  desc 'Install Redis'
-  task :redis_install do
-    on roles(:all) do
-      execute "mkdir -p ~/sources/redis"
-      execute sudo_command + "apt-get install -y tcl8.5"
-      within "~/sources/redis" do
-        execute :wget, "http://download.redis.io/redis-stable.tar.gz"
-        execute :tar, "xvzf redis-stable.tar.gz"
-      end
-      within "~/sources/redis/redis-stable" do
-        execute :make
-      end
-      execute sudo_command + "cp -f ~/sources/redis/redis-stable/src/redis-server /usr/local/bin/"
-      execute sudo_command + "cp -f ~/sources/redis/redis-stable/src/redis-cli /usr/local/bin/"
-      execute sudo_command + "mkdir -p /etc/redis/"
-      execute sudo_command + "cp ~/sources/redis/redis-stable/redis.conf /etc/redis/"
-    end
-  end
-
-  desc 'Configure Redis'
-  task :redis_conf do
-    on roles(:all) do
-      user = capture("echo $USER")
-      execute sudo_command + "mkdir -p /var/www/other"
-      execute sudo_command + "mkdir -p /var/www/log"
-      execute sudo_command + "chgrp -R web /var/www"
-      execute sudo_command + "chmod -R 775 /var/www"
-      execute sudo_command + "chown -R #{user} /var/www"
-      execute "mkdir -p ~/sources/redis/conf"
-
-      upload! 'config/production/redis/redis.conf', "/home/#{user}/sources/redis/conf/"
-      upload! 'config/production/redis/upstart.conf', "/home/#{user}/sources/redis/conf/"
-      execute sudo_command + "cp -f ~/sources/redis/conf/upstart.conf /etc/init/redis-server.conf"
-      execute sudo_command + "cp -f ~/sources/redis/conf/redis.conf /etc/redis/"
-
-      redis_status = capture(sudo_command + "status redis-server")
-      if redis_status == 'redis-server stop/waiting'
-        execute sudo_command + "start redis-server"
-      else
-        execute sudo_command + 'restart redis-server'
-      end
-    end
-  end
-
-  desc 'Install RVM with rails'
-  task :rvm_install do
-    on roles(:all) do
-      execute sudo_command + 'apt-get -y install git curl python-software-properties software-properties-common'
-      execute sudo_command + 'add-apt-repository -y ppa:chris-lea/node.js'
-      execute sudo_command + 'apt-get update'
-      execute sudo_command + 'apt-get -y install nodejs gawk g++ gcc make libreadline6-dev zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev libncurses5-dev automake libtool bison pkg-config libffi-dev'
-      execute "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
-      execute "\\curl -sSL https://get.rvm.io | bash -s stable --rails --gems=bundler --autolibs=read-fail"
-    end
-  end
-
-
-
-  desc 'Push ssh key to server'
-  task :push_ssh_keys do
-    on roles(:all) do
-      files =  Dir.glob(Dir.home() + '/.ssh/*').select { |f| f !~ /\.pub|known|config/ }.map {|f| f.gsub!(Dir.home(), '~')}
-      set :key_localtion, ask("private key location (for example: #{files.join(', ')})", '~/.ssh/id_rsa') if !fetch :key_localtion
-      home = Dir.home()
-      key_location = fetch(:key_localtion).gsub('~', home)
-      until File.exists? key_location
-        set :key_localtion, ask("private key location (for example: #{files.join(', ')})", '~/.ssh/id_rsa')
-        key_location = fetch(:key_localtion).gsub('~', home)
-      end
-      execute "mkdir -p ~/.ssh"
-      user = capture("echo $USER")
-      upload! key_location, "/home/#{user}/.ssh/git_key"
-      upload! key_location + '.pub', "/home/#{user}/.ssh/git_key.pub"
-      execute "echo 'IdentityFile ~/.ssh/git_key' >> ~/.ssh/config"
-      execute "chmod -f 600 ~/.ssh/*"
-=======
 
     desc 'Push ssh key to server'
     task :push_ssh_keys do
@@ -405,7 +301,6 @@ namespace :ubuntu_server_prepare do
             execute "echo 'IdentityFile ~/.ssh/git_key' >> ~/.ssh/config"
             execute "chmod -f 600 ~/.ssh/*"
         end
->>>>>>> 3b841ddc013973d608456aa8839726cdf98cb11e
     end
 
     desc 'Install additional packages'
@@ -442,4 +337,4 @@ namespace :ubuntu_server_prepare do
     end
 
 end
-task :ubuntu_server_prepare => "ubuntu_server_prepare:default"
+task :ubuntu_server_prepare => "ubuntu_server_prepare:default"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-ubuntu-server-prepare
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - goooseman
@@ -89,6 +89,7 @@ files:
 - capistrano3-ubuntu-server-prepare-0.0.1.gem
 - capistrano3-ubuntu-server-prepare-0.0.2.gem
 - capistrano3-ubuntu-server-prepare-0.0.3.gem
+- capistrano3-ubuntu-server-prepare-0.0.4.gem
 - config/production/nginx/nginx.conf
 - config/production/nginx/nginx_with_pagespeed.conf
 - config/production/nginx/upstart.conf