total cleanup

This commit is contained in:
magnolia-fan
2011-06-13 16:54:56 +04:00
parent 1d9a0398c6
commit 447239f824
49 changed files with 571 additions and 1854 deletions
-2
View File
@@ -38,7 +38,5 @@ module Beathaven
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
#config.autoload_paths += %W(#{config.root}/lib/db)
end
end
-2
View File
@@ -1,8 +1,6 @@
#utf-8
require 'rubygems'
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
require 'json'
+17 -9
View File
@@ -1,14 +1,22 @@
defaults: &defaults
adapter: postgresql
database: beathaven
host: 192.168.0.128
username: postgres
password: password
# SQLite version 3.x
# gem install sqlite3
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
development:
<<: *defaults
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000
production:
<<: *defaults
adapter: sqlite3
database: db/production.sqlite3
pool: 5
timeout: 5000
+1 -1
View File
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Beathaven::Application.config.secret_token = '4640513caed8bd0f9d5de3f39e95fd8cf6c070424b3f1c6da5c6e1a0aac18af67242e6866f1f7c970b426db07c68c960a22dcf45e4e8ac0a02a5fd32a6ba4bee'
Beathaven::Application.config.secret_token = '9f7bfb8b5bebe7befaa38b67e70694dc98c19780eb161b75b1c7251a93874c27138865f5cc3319a72c244560c74994eb69f193f17333943f2a18b867389c48c7'
-20
View File
@@ -1,20 +0,0 @@
defaults: &defaults
host: 192.168.0.100
port: 27017
database: beathaven
# slaves:
# - host: slave1.local
# port: 27018
# - host: slave2.local
# port: 27019
development:
<<: *defaults
test:
<<: *defaults
# set these environment variables on your prod server
production:
<<: *defaults
+49 -19
View File
@@ -1,28 +1,58 @@
Beathaven::Application.routes.draw do
get "bot/list"
# The priority is based upon order of creation:
# first created -> highest priority.
get "bot/stats"
# Sample of regular route:
# match 'products/:id' => 'catalog#view'
# Keep in mind you can assign values other than :controller and :action
match "bot/queue/" => "bot#queue"
match "bot/start/:name" => "bot#start"
match "bot/stop/:name" => "bot#stop"
match "bot/add/:name" => "bot#add"
# Sample of named route:
# match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
# This route can be invoked with purchase_url(:id => product.id)
get "main/index"
# Sample resource route (maps HTTP verbs to controller actions automatically):
# resources :products
root :to => "main#index", :as => "main"
# Sample resource route with options:
# resources :products do
# member do
# get 'short'
# post 'toggle'
# end
#
# collection do
# get 'sold'
# end
# end
match 'artist(/:name)' => 'artist#view'
match 'listen/:id' => 'track#listen'
match 'search/autocomplete' => 'artist#autocomplete'
# Sample resource route with sub-resources:
# resources :products do
# resources :comments, :sales
# resource :seller
# end
# Registration & login
match 'reg/:email/:code' => 'user#register', :constraints => { :email => /[-a-z0-9\._@]+/i, :code => /[a-f0-9]{64}/ }
match 'reg/complete' => 'user#complete'
match 'login' => 'user#login'
match 'user/profile' => 'user#update'
match 'user/invite' => 'user#invite'
# Sample resource route with more complex sub-resources
# resources :products do
# resources :comments
# resources :sales do
# get 'recent', :on => :collection
# end
# end
match '*a', :to => 'errors#routing'
# Sample resource route within a namespace:
# namespace :admin do
# # Directs /admin/products/* to Admin::ProductsController
# # (app/controllers/admin/products_controller.rb)
# resources :products
# end
# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
# root :to => "welcome#index"
# See how all your routes lay out with "rake routes"
# This is a legacy wild controller route that's not recommended for RESTful applications.
# Note: This route will make all actions in every controller accessible via GET requests.
# match ':controller(/:action(/:id(.:format)))'
end
-71
View File
@@ -1,71 +0,0 @@
# Vkontake accounts config
Bach: # Bach himself
user_id: 5728795
email: chezzzy@yandex.ru
password: yabach!
remixsid: 47c2f5501b22a3e3aa6947e5e74d1a72381267df2502570eb75c94481ade
remixchk: 5
user_agent: "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru; rv:1.9.2.13) Gecko/20101203 Firefox/3.6.13"
Mozart: # Hedg
user_id: 69139853
email: alexgreen1978@gmail.com
password: fbcn136
remixsid: bc5386a4f49f8bf7df20e11bdd311a7120818d83c23d93cd08177d5d3674
remixchk: 5
user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.307.9 Safari/532.9"
Schubert: # Chez
user_id: 1217744
email: phpdev.ru@gmail.com
password: yanebach!
remixsid: fc27c3a7874bc0b84477015e187e5e0bd3a71bdca02d98327595ef255773
remixchk: 5
user_agent: "Mozilla/5.0 (Macintosh; U; PPC Max OS X Mach-O; en-US; rv:1.8.0.7) Gecko/200609211 Camino/1.0.3"
Vivaldi: # Flint
user_id: 382067
remixsid: 9afa6f2e6d352b01d1a3742b2c0f6c09dbefe2158f3dcb61d30fe438dbc2
remixchk: 5
user_agent: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
# Prokofiev: # Daddy
# user_id:24538630
# remixsid: 832fae47c8dfc8df66551b8c72927ca26f6ee49f5754b24e9a9a317805c5
# remixchk: 5
# user_agent: "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; WebMoney Advisor; GTB6.3; InfoPath.2; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; OfficeLiveConnector.1.3; OfficeLivePatch.0.0; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
Paganini: # Tom_Orrow
user_id: 1554168
email: agent_smith@gmail.ru
password: GoTo17db14DB
remixsid: cf89c2e8ef6ab2337c3b4ef22bdd38be70c880da7f9ef73ff7d02ff9608e
remixchk: 5
user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
# Stolen
# Stolen_Moroz:
# user_id: 9444259
# email: 89232979779@mail.ru
# password: beatcobot1
# remixsid: d5b1289ae534887319f41bdebf435f9ed3721ccf9203d7
# remixchk: 5
# user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
Stolen_NarutoSasuke:
user_id: 29280365
email: narutosasuke1@mail.ru
password: beatcobot
remixsid: 3c2174798f22fdf06643efb2fe8661f43805def362c8c0fce9c32c8fb8c4
remixchk: 5
user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
Stolen_Nelpon:
user_id: 42952537
email: nelpon@mail.ru
password: beatcobot
remixsid: 1864242e856873120b38b27abe271a46e73f93b848b7ccf87e711a402271
remixchk: 5
user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"