diff --git a/lib/tasks/copy_site.rake b/lib/tasks/copy_site.rake
index 0437460..6c9b96f 100644
--- a/lib/tasks/copy_site.rake
+++ b/lib/tasks/copy_site.rake
@@ -32,16 +32,15 @@ namespace :create_site do
system("ssh-add \"$HOME/.ssh/id_rsa\"")
end
Net::SSH.start(args.ip , args.user , { password: args.password, port: args.server_port}) do |ssh|
- update_infos("setting nginx for #{args.site_name}")
+ update_infos("Setting nginx for #{args.site_name}")
nginx_setting_texts = @site_construct.generate_nginx_text
exec_ssh_command_by_sudo_for_copy(ssh,"touch /etc/nginx/orbit_sites/#{@site_construct.get_site_name}")
exec_ssh_command_by_sudo_for_copy(ssh,"x='#{nginx_setting_texts.gsub(/'{1,3}/,"\"\'\"")}'; echo '#{@password}' | sudo -S sh -c \"echo '$x' > /etc/nginx/orbit_sites/#{@site_construct.get_site_name}\"")
- update_infos("restarting nginx")
+ update_infos("Restarting nginx")
exec_ssh_command_by_sudo_for_copy(ssh,"sudo -p 'sudo password:' service nginx restart")
- update_infos("finish restarting nginx")
+ update_infos("Finish restarting nginx")
exec_ssh_command_by_sudo_for_copy(ssh,"mkdir -p #{args.path}")
-
- update_infos("copying site's files for #{args.site_name}")
+ update_infos("Copying site's files for #{args.site_name}")
exec_ssh_command_for_copy(ssh,"sudo -p 'sudo password:' apt-get install -y rsync")
extra_exclude_path = ""
if args.only_copy_installed_module == true || args.only_copy_installed_module == "true"
@@ -63,14 +62,13 @@ namespace :create_site do
end
end
update_infos("Finish copying site's files for #{args.site_name}!")
-
exec_ssh_command_by_sudo_for_copy(ssh,"sudo -p 'sudo password:' chown #{args.user}:#{args.user} #{args.path}/#{@site_construct.get_site_name} -R")
exec_ssh_command_by_sudo_for_copy(ssh,"sudo -p 'sudo password:' chmod 777 #{args.path}/#{@site_construct.get_site_name} -R")
db_setting_text = ssh.exec!("cat #{args.path}/#{args.site_name}/config/mongoid.yml")
- update_infos("setting dbname to #{args.db_name}")
+ update_infos("Setting dbname to #{args.db_name}")
exec_ssh_command_by_sudo_for_copy(ssh,"sh -c \"echo '#{db_setting_text.gsub(/database: .+/,"database: "+args.db_name)}' > #{args.path}/#{@site_construct.get_site_name}/config/mongoid.yml\"",true)
unless args.only_copy_installed_module == true || args.only_copy_installed_module == "true"
- update_infos("copying db from #{template_site.db_name} to #{args.db_name}")
+ update_infos("Copying db from #{template_site.db_name} to #{args.db_name}")
if @site_construct.server_type == template_site.server_type
exec_ssh_command_by_sudo_for_copy(ssh,"mongodump -d #{template_site.db_name} -o #{args.path}/#{@site_construct.get_site_name}/dump_xxxx")
exec_ssh_command_by_sudo_for_copy(ssh,"mongorestore --drop -d #{args.db_name} #{args.path}/#{@site_construct.get_site_name}/dump_xxxx/#{template_site.db_name}")
@@ -111,17 +109,17 @@ namespace :create_site do
end
update_infos("Finish checking extensions!")
- update_infos("execing bundle install...")
+ update_infos("Execing bundle install...")
exec_ssh_command_by_sudo_for_copy(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nrm -f Gemfile.lock\nbundle install'",true)
exec_ssh_command_by_sudo_for_copy(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nrm -f Gemfile.lock\nbundle install'")
- update_infos("finish execing bundle install")
- update_infos("starting #{args.site_name} web server to development")
+ update_infos("Finish execing bundle install")
+ update_infos("Starting #{args.site_name} web server to development")
outputs = exec_ssh_command_by_sudo_for_copy(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nkill -s TERM `fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" kill -s TERM `sudo -p \"sudo password:\" fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" rm -f tmp/pids/unicorn.pid\nbundle exec unicorn_rails -c config/unicorn.rb -D -E development\n'")
if (outputs.include? "not writable" rescue false)
exec_ssh_command_by_sudo_for_copy(ssh,"sudo -p 'sudo password:' chown #{args.user}:#{args.user} #{args.path}/#{@site_construct.get_site_name} -R")
exec_ssh_command_by_sudo_for_copy(ssh,"sudo -p 'sudo password:' chmod 777 #{args.path}/#{@site_construct.get_site_name} -R")
end
- update_infos("finish creating #{args.site_name}")
+ update_infos("Finish creating #{args.site_name}")
exec_ssh_command_by_sudo_for_copy(ssh,"chmod 777 #{args.path}/#{@site_construct.get_site_name} -R")
@site_construct.update(:status =>"finish")
puts "finish creating #{args.site_name} on #{args.ip}"
diff --git a/lib/tasks/create_site.rake b/lib/tasks/create_site.rake
index 2a58fd6..15b0b45 100644
--- a/lib/tasks/create_site.rake
+++ b/lib/tasks/create_site.rake
@@ -30,15 +30,15 @@ namespace :create_site do
system("ssh-add \"$HOME/.ssh/id_rsa\"")
end
Net::SSH.start(args.ip , args.user , { password: args.password, port: args.server_port}) do |ssh|
- update_infos("setting nginx for #{args.site_name}")
+ update_infos("Setting nginx for #{args.site_name}")
nginx_setting_texts = @site_construct.generate_nginx_text
exec_ssh_command_by_sudo_for_create(ssh,"touch /etc/nginx/orbit_sites/#{@site_construct.get_site_name}")
exec_ssh_command_by_sudo_for_create(ssh,"x='#{nginx_setting_texts.gsub(/'{1,3}/,"\"\'\"")}'; echo '#{@password}' | sudo -S sh -c \"echo '$x' > /etc/nginx/orbit_sites/#{@site_construct.get_site_name}\"")
- update_infos("restarting nginx")
+ update_infos("Restarting nginx")
exec_ssh_command_by_sudo_for_create(ssh,"sudo -p 'sudo password:' service nginx restart")
- update_infos("finish restarting nginx")
+ update_infos("Finish restarting nginx")
exec_ssh_command_by_sudo_for_create(ssh,"mkdir -p #{args.path}")
- update_infos("cloning orbit4-5 from #{args.git_url} to #{args.path}/#{args.site_name}")
+ update_infos("Cloning orbit4-5 from #{args.git_url} to #{args.path}/#{args.site_name}")
exec_ssh_command_by_sudo_for_create(ssh,"git clone #{args.git_url} #{args.path}/#{@site_construct.get_site_name}")
exec_ssh_command_by_sudo_for_create(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name} && git submodule add #{args.git_template_url} app/templates/default-theme'")
exec_ssh_command_by_sudo_for_create(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name} && git submodule add #{args.git_extension_url} modules'")
@@ -47,7 +47,7 @@ namespace :create_site do
exec_ssh_command_by_sudo_for_create(ssh,"sudo -p 'sudo password:' chown #{args.user}:#{args.user} #{args.path}/#{@site_construct.get_site_name} -R")
exec_ssh_command_by_sudo_for_create(ssh,"sudo -p 'sudo password:' chmod 777 #{args.path}/#{@site_construct.get_site_name.gsub(" ","\\ ")} -R")
db_setting_text = ssh.exec!("cat #{args.path}/#{@site_construct.get_site_name}/config/mongoid.yml")
- update_infos("setting dbname to #{@site_construct.db_name}")
+ update_infos("Setting dbname to #{@site_construct.db_name}")
exec_ssh_command_by_sudo_for_create(ssh,"sh -c \"echo '#{db_setting_text.gsub("orbit_4_5",@site_construct.db_name)}' > #{args.path}/#{@site_construct.get_site_name}/config/mongoid.yml\"",true)
rvm_path = ssh.exec!("which rvm").to_s.strip
if rvm_path.blank?
@@ -67,24 +67,24 @@ namespace :create_site do
end
end
if gemdir.include?("No such file or directory")
- update_infos("please connect your admin to install rvm on #{args.ip}")
+ update_infos("Please connect your admin to install rvm on #{args.ip}")
@site_construct.update(:status =>"error")
else
bundle_dir = gemdir.gsub("\n","") + '/bin/bundle'
- update_infos("execing bundle install...")
+ update_infos("Execing bundle install...")
exec_ssh_command_by_sudo_for_create(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nbundle install'",true)
exec_ssh_command_by_sudo_for_create(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nbundle install'")
- update_infos("finish execing bundle install")
- update_infos("starting #{args.site_name} web server to development")
+ update_infos("Finish execing bundle install")
+ update_infos("Starting #{args.site_name} web server to development")
outputs = exec_ssh_command_by_sudo_for_create(ssh,"bash -l -c 'cd #{args.path}/#{@site_construct.get_site_name}\nkill -s TERM `fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" kill -s TERM `sudo -p \"sudo password:\" fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" rm -f tmp/pids/unicorn.pid\nbundle exec unicorn_rails -c config/unicorn.rb -D -E development\n'")
if outputs.include? "not writable"
exec_ssh_command_by_sudo_for_create(ssh,"sudo -p 'sudo password:' chown #{args.user}:#{args.user} #{args.path}/#{@site_construct.get_site_name} -R")
exec_ssh_command_by_sudo_for_create(ssh,"sudo -p 'sudo password:' chmod 777 #{args.path}/#{@site_construct.get_site_name} -R")
end
- update_infos("finish creating #{args.site_name}")
+ update_infos("Finish creating #{args.site_name}")
exec_ssh_command_by_sudo_for_create(ssh,"chmod 777 #{args.path}/#{@site_construct.get_site_name} -R")
@site_construct.update(:status =>"finish")
- puts "finish creating #{args.site_name} on #{args.ip}"
+ puts "Finish creating #{args.site_name} on #{args.ip}"
end
end
rescue =>e
diff --git a/lib/tasks/delete_site.rake b/lib/tasks/delete_site.rake
index e98e2d7..dfadf1d 100644
--- a/lib/tasks/delete_site.rake
+++ b/lib/tasks/delete_site.rake
@@ -26,19 +26,19 @@ namespace :create_site do
end
exec_ssh_command_by_sudo(ssh,"kill -s TERM `cat tmp/pids/unicorn.pid`")
exec_ssh_command_by_sudo(ssh,"kill -s TERM `fuser tmp/unicorn.sock`")
- update_infos("deleting database for #{@site_construct.site_name}")
+ update_infos("Deleting database for #{@site_construct.site_name}")
db_name = exec_ssh_command_by_sudo(ssh,"echo `cat #{@site_construct.path}/#{@site_construct.get_site_name}/config/mongoid.yml | grep 'database'`").split("database:").last.strip
exec_ssh_command_by_sudo(ssh,"bash -l -c 'echo \"db.dropDatabase()\" | mongo --shell \'#{db_name}\''")
- update_infos("finish deleting database for #{@site_construct.site_name}")
- update_infos("deleting orbit4-5 at #{@site_construct.path}/#{@site_construct.site_name}")
+ update_infos("Finish deleting database for #{@site_construct.site_name}")
+ update_infos("Deleting orbit4-5 at #{@site_construct.path}/#{@site_construct.site_name}")
exec_ssh_command_by_sudo(ssh,"rm -rf #{@site_construct.path}/#{@site_construct.get_site_name}")
- update_infos("finish deleting #{@site_construct.site_name}")
- update_infos("deleting nginx for #{@site_construct.site_name}")
+ update_infos("Finish deleting #{@site_construct.site_name}")
+ update_infos("Deleting nginx for #{@site_construct.site_name}")
exec_ssh_command_by_sudo(ssh,"rm -f #{@site_construct.nginx_file.gsub(" ","\\ ")}")
- update_infos("finish deleting nginx setting for #{@site_construct.site_name}")
- update_infos("restarting nginx")
+ update_infos("Finish deleting nginx setting for #{@site_construct.site_name}")
+ update_infos("Restarting nginx")
exec_ssh_command_by_sudo(ssh,"service nginx restart")
- update_infos("finish restarting nginx")
+ update_infos("Finish restarting nginx")
@site_construct.update(:status =>"")
end
rescue =>e
diff --git a/lib/tasks/exec_command.rake b/lib/tasks/exec_command.rake
index ad928f1..04692d3 100644
--- a/lib/tasks/exec_command.rake
+++ b/lib/tasks/exec_command.rake
@@ -73,7 +73,7 @@ namespace :exec_commands do
if args.type == 'close_site'
exec_ssh_command_by_sudo_and_see_output(ssh,"chmod 777 #{@site_construct.path}/#{@site_construct.site_name} -R",false)
exec_ssh_command_by_sudo_and_see_output(ssh,"bash -l -c 'kill -s TERM `fuser #{@site_construct.path}/#{@site_construct.site_name}/tmp/unicorn.sock`'",false)
- update_infos_for_exec("finish closing #{@site_construct.site_name}")
+ update_infos_for_exec("Finish closing #{@site_construct.site_name}")
@site_construct.update(:status =>"closed")
elsif args.type == 'open_site'
default_rails_env = 'development'
@@ -93,11 +93,11 @@ namespace :exec_commands do
rails_env = args.rails_env
end
@site_construct.update(:rails_env=>rails_env)
- update_infos_for_exec("starting site to #{rails_env}")
+ update_infos_for_exec("Starting site to #{rails_env}")
outputs = exec_ssh_command_by_sudo_and_see_output(ssh,"sudo -p 'sudo password:' chmod 777 #{@site_construct.path}/#{@site_construct.site_name} -R",false)
output = exec_ssh_command_by_sudo_and_see_output(ssh,"bash -l -c 'cd #{@site_construct.path}/#{@site_construct.site_name}\nkill -s TERM `fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" kill -s TERM `sudo -p \"sudo password:\" fuser tmp/unicorn.sock`\nsudo -p \"sudo password:\" rm -f tmp/pids/unicorn.pid\nbundle exec unicorn_rails -c config/unicorn.rb -D -E #{rails_env}\n'",false)
if output.include? "bundle install"
- update_infos_for_exec("not yet bundle install")
+ update_infos_for_exec("Not yet bundle install")
outputs = exec_ssh_command_by_sudo_and_see_output(ssh,"bash -l -c 'cd #{@site_construct.path}/#{@site_construct.site_name};bundle install'")
if outputs.join("\n").include? "Username for"
update_infos_for_exec("Cannot finish bundle install.")
@@ -108,7 +108,7 @@ namespace :exec_commands do
exec_ssh_command_by_sudo_and_see_output(ssh,"bundle exec unicorn_rails -c config/unicorn.rb -D -E #{rails_env}",false)
end
end
- update_infos_for_exec("finish starting #{@site_construct.site_name}")
+ update_infos_for_exec("Finish starting #{@site_construct.site_name}")
@site_construct.update(:status =>"finish")
else
if args.type == 'exec_all'
@@ -243,10 +243,10 @@ namespace :exec_commands do
if update
command_i18n = @command_i18n if @command_i18n
if @site_construct
- update_thread_infos_for_exec(["execing #{command_i18n} on on #{@site_construct.domain_name}",""],false,true) if @flag
- update_infos_for_exec(["execing #{command_i18n}",""],false,true)
+ update_thread_infos_for_exec(["Execing #{command_i18n} on on #{@site_construct.domain_name}",""],false,true) if @flag
+ update_infos_for_exec(["Execing #{command_i18n}",""],false,true)
elsif @thread
- update_thread_infos_for_exec(["execing #{command_i18n}...",""],false,true)
+ update_thread_infos_for_exec(["Execing #{command_i18n}...",""],false,true)
end
end
session.open_channel do |channel|
@@ -317,10 +317,10 @@ namespace :exec_commands do
channel.on_close do |ch|
if update
if @site_construct
- update_thread_infos_for_exec("finish execing #{command_i18n} on #{@site_construct.domain_name}") if @flag
- update_infos_for_exec("finish execing #{command_i18n}")
+ update_thread_infos_for_exec("Finish execing #{command_i18n} on #{@site_construct.domain_name}") if @flag
+ update_infos_for_exec("Finish execing #{command_i18n}")
elsif @thread
- update_thread_infos_for_exec("finish execing #{command_i18n}")
+ update_thread_infos_for_exec("Finish execing #{command_i18n}")
end
end
end