diff --git a/app/views/admin/site_panel/_sites_list_table.html.erb b/app/views/admin/site_panel/_sites_list_table.html.erb index 3f2c253..71946aa 100644 --- a/app/views/admin/site_panel/_sites_list_table.html.erb +++ b/app/views/admin/site_panel/_sites_list_table.html.erb @@ -35,6 +35,7 @@ site.domain_name})%>" class="btn btn-primary close_site" data-id="<%=site.id.to_s%>"><%=t('client_management.close_site')%> <%=t('client_management.restart_site')%> <% elsif site.status == "closed" %> + site.domain_name})%>" class="btn btn-primary delete_site" data-id="<%=site.id.to_s%>"><%=t('client_management.delete_site')%> site.domain_name})%>" class="btn btn-primary open_site" data-id="<%=site.id.to_s%>"><%=t('client_management.start_site')%> <% end%> <% if site.status.present? %> diff --git a/lib/tasks/delete_site.rake b/lib/tasks/delete_site.rake index 01509b0..068a31e 100644 --- a/lib/tasks/delete_site.rake +++ b/lib/tasks/delete_site.rake @@ -20,6 +20,11 @@ namespace :create_site do end Net::SSH.start(ip , user , password: password) do |ssh| @site_construct.update!(:infos=>[]) + if @site_construct.status != "closed" + update_infos("Closing site #{@site_construct.site_name}...") + 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}") 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}\''")