Added deactivate_and_clean to routes, updated schema after merge from…

… upstream
antisnatchor · Oct 19, 2015 · 72f2868 · 72f2868
1 parent c950cbe
commit 72f2868
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -12,7 +12,7 @@
 	post '/email/launch_email/:id' =>  'email#launch', as: 'launch'
 
 	# only allow deletion from POST requests
-	get '/campaigns/delete_smtp_entry/:id' => 'campaigns#list'
+	# get '/campaigns/delete_smtp_entry/:id' => 'campaigns#list'
 
 	get "reports/list"
 	get "reports/show"
@@ -33,6 +33,7 @@
 			get 'aboutus'
 			get 'victims'
 			get 'activity'
+      get 'deactivate_and_clean'
 			delete 'destroy'
 		end
 		member do

diff --git a/config/sidekiq.yml b/config/sidekiq.yml
@@ -3,10 +3,10 @@
 #   sidekiq -C config.yml
 ---
 :verbose: false
-:pidfile: ./tmp/pids/sidekiq.pid
-:logfile: ./log/sidekiq.log
+:pidfile: ../tmp/pids/sidekiq.pid
+:logfile: ../log/sidekiq.log
 :concurrency:  25
 :queues:
   - [often, 7]
   - [default, 5]
-  - [seldom, 3]
+  - [seldom, 3]
diff --git a/db/schema.rb b/db/schema.rb
@@ -83,8 +83,8 @@
     t.integer  "number_of_targets"
     t.integer  "emails_sent",       default: 0
     t.string   "message",           default: "Started  "
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                              null: false
+    t.datetime "updated_at",                              null: false
     t.integer  "baits_count",       default: 0
   end
 
@@ -174,8 +174,8 @@
   create_table "global_settings", force: true do |t|
     t.string   "command_apache_restart"
     t.integer  "smtp_timeout",           default: 5
-    t.datetime "created_at",                                                    null: false
-    t.datetime "updated_at",                                                    null: false
+    t.datetime "created_at",                                                      null: false
+    t.datetime "updated_at",                                                      null: false
     t.string   "command_apache_status"
     t.string   "command_apache_vhosts",  default: "apache2ctl -S"
     t.boolean  "asynchronous",           default: true