Retab the project
This commit is contained in:
parent
3d939a1119
commit
5595dc5f48
6 changed files with 32 additions and 32 deletions
|
|
@ -295,11 +295,11 @@ class User
|
|||
aspect(:name => "Family")
|
||||
aspect(:name => "Work")
|
||||
end
|
||||
|
||||
def self.create(opts ={})
|
||||
puts opts.inspect
|
||||
end
|
||||
|
||||
|
||||
def self.create(opts ={})
|
||||
puts opts.inspect
|
||||
end
|
||||
|
||||
def terse_url
|
||||
terse = self.url.gsub(/(https?:|www\.)\/\//, '')
|
||||
terse = terse.chop! if terse[-1, 1] == '/'
|
||||
|
|
|
|||
|
|
@ -58,17 +58,17 @@ namespace :deploy do
|
|||
task :start do
|
||||
start_mongo
|
||||
start_thin
|
||||
end
|
||||
end
|
||||
|
||||
task :start_mongo do
|
||||
run("mkdir -p -v #{current_path}/log/db/ ")
|
||||
run("mkdir -p -v #{current_path}/log/db/ ")
|
||||
run("mkdir -p -v #{shared_path}/db/")
|
||||
run("mongod --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
|
||||
run("mongod --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
|
||||
end
|
||||
|
||||
task :start_thin do
|
||||
run("mkdir -p -v #{current_path}/log/thin/ ")
|
||||
run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
|
||||
run("mkdir -p -v #{current_path}/log/thin/ ")
|
||||
run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
|
||||
end
|
||||
|
||||
task :stop do
|
||||
|
|
|
|||
|
|
@ -6,23 +6,23 @@
|
|||
|
||||
#package :mongo, :provides => :database do
|
||||
# description 'Mongodb'
|
||||
# version '1.4.3'
|
||||
# source "http://downloads.mongodb.org/src/mongodb-src-r#{version}.tar.gz"
|
||||
# version '1.4.3'
|
||||
# source "http://downloads.mongodb.org/src/mongodb-src-r#{version}.tar.gz"
|
||||
#end
|
||||
|
||||
package :mongodb, :provides => :database do
|
||||
description 'Mongodb debian package.'
|
||||
version '1.4.3'
|
||||
version '1.4.3'
|
||||
|
||||
binary "http://downloads.mongodb.org/linux/mongodb-linux-x86_64-static-legacy-#{version}.tgz" do
|
||||
post :install, "ln -s -f /usr/local/bin/mongodb-linux-x86_64-static-#{version}/bin/mongod /usr/bin/mongod"
|
||||
end
|
||||
post :install, "ln -s -f /usr/local/bin/mongodb-linux-x86_64-static-#{version}/bin/mongod /usr/bin/mongod"
|
||||
end
|
||||
end
|
||||
|
||||
package :mongo_driver do
|
||||
description 'Ruby mongo database driver'
|
||||
gem 'mongo'
|
||||
gem 'bson'
|
||||
gem 'bson_ext'
|
||||
requires :rubygems
|
||||
gem 'bson'
|
||||
gem 'bson_ext'
|
||||
requires :rubygems
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,25 +25,25 @@ package :rubygems do
|
|||
source "http://production.cf.rubygems.org/rubygems/rubygems-#{version}.tgz" do
|
||||
custom_install 'ruby setup.rb'
|
||||
end
|
||||
run( "PATH=$PATH:/var/lib/gems/1.8/bin")
|
||||
run( "export PATH")
|
||||
run( "PATH=$PATH:/var/lib/gems/1.8/bin")
|
||||
run( "export PATH")
|
||||
requires :ruby
|
||||
end
|
||||
|
||||
package :bundler do
|
||||
description 'bundler'
|
||||
version '0.9.26'
|
||||
gem 'bundler'
|
||||
requires :rubygems
|
||||
description 'bundler'
|
||||
version '0.9.26'
|
||||
gem 'bundler'
|
||||
requires :rubygems
|
||||
end
|
||||
|
||||
package :diaspora_dependencies do
|
||||
description 'random dependencies'
|
||||
apt %w(libxslt1.1 libxslt1-dev libxml2 libgpgme11-dev imagemagick libmagick9-dev)
|
||||
description 'random dependencies'
|
||||
apt %w(libxslt1.1 libxslt1-dev libxml2 libgpgme11-dev imagemagick libmagick9-dev)
|
||||
end
|
||||
#package :diaspora do
|
||||
# description 'Diaspora'
|
||||
|
||||
# description 'Diaspora'
|
||||
|
||||
=begin
|
||||
package :rails do
|
||||
description 'Ruby on Rails'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
package :git, :provides => :scm do
|
||||
description 'Git Distributed Version Control'
|
||||
apt %w( git-core )
|
||||
apt %w( git-core )
|
||||
requires :pubkey
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ policy :diaspora, :roles => [:tom,:backer] do
|
|||
# requires :clean_dreamhost
|
||||
requires :tools
|
||||
requires :rubygems
|
||||
requires :bundler
|
||||
requires :bundler
|
||||
requires :diaspora_dependencies
|
||||
requires :database
|
||||
requires :webserver
|
||||
|
|
@ -40,8 +40,8 @@ deployment do
|
|||
archives '/usr/local/sources'
|
||||
builds '/usr/local/build'
|
||||
end
|
||||
binary do
|
||||
prefix '/usr/local/bin'
|
||||
binary do
|
||||
prefix '/usr/local/bin'
|
||||
archives '/usr/local/sources'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue