From 73e26ecffebac60ca1f2450fb0230918b52cee51 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 12 Feb 2013 19:40:58 +0100 Subject: [PATCH] mise en ligne --- config/database.yml | 6 +- config/deploy.rb | 135 +++++++++++++++++++++++--------------------- config/nginx.conf | 12 ++-- config/unicorn.rb | 2 +- 4 files changed, 82 insertions(+), 73 deletions(-) diff --git a/config/database.yml b/config/database.yml index e5258f6..0f819df 100644 --- a/config/database.yml +++ b/config/database.yml @@ -24,8 +24,8 @@ test: production: adapter: mysql2 encoding: utf8 - database: blog_perso_app + database: ecole_eft_app pool: 5 - username: blog_perso_app - password: blog_perso_prod + username: ecole_eft_app + password: ecole_eft_app socket: /var/run/mysqld/mysqld.sock \ No newline at end of file diff --git a/config/deploy.rb b/config/deploy.rb index 30ff28d..3fa9861 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,104 +1,113 @@ -set :application, 'blog_perso_app' - set :domain, 'blog.nicolasbally.com' +set :application, 'ecole_eft_app' + set :domain, 'new.ecole-eft-france.fr' - require "rvm/capistrano" - set :rvm_ruby_string, 'ruby-1.9.3-p0' - set :rvm_type, :user + require "rvm/capistrano" - set :user, 'web' + set :rvm_ruby_string, 'ruby-1.9.3-p0' + set :rvm_type, :user + + set :user, 'web' - set :deploy_to, "/home/#{user}/#{application}/" - set :deploy_via, :remote_cache + set :deploy_to, "/home/#{user}/#{application}/" + set :deploy_via, :remote_cache - set :normalize_asset_timestamps, false + set :normalize_asset_timestamps, false - set :rails_env, "production" + set :rails_env, "production" - role :app, domain - role :web, domain - role :db, domain, :primary => true + role :app, domain + role :web, domain + role :db, domain, :primary => true - set :scm, :git - set :repository, "git@box1.quartz-agence.com:#{application}.git" - set :branch, "master" + set :scm, :git + set :repository, "git@gitlab.bally.me:root/site-perso.git" + set :branch, "master" - default_run_options[:pty] = true + default_run_options[:pty] = true - before "deploy:symlink", "deploy:bundle_gems" - after "deploy:bundle_gems", "deploy:make_simlinks" - after "deploy:make_simlinks", "assets:precompile" + before "deploy:symlink", "deploy:bundle_gems" + after "deploy:bundle_gems", "deploy:make_simlinks" + after "deploy:make_simlinks", "assets:precompile" -# after "deploy", "deploy:restart" - after "deploy:restart", "deploy:cleanup" + # after "deploy", "deploy:restart" + after "deploy:restart", "deploy:cleanup" - #after "deploy", "deploy:bundle_gems" - #after "deploy:bundle_gems", "deploy:make_simlinks" - #after "deploy:make_simlinks", "assets:precompile" - #after "assets:precompile", "deploy:restart" - #after "deploy:restart", "deploy:cleanup" + #after "deploy", "deploy:bundle_gems" + #after "deploy:bundle_gems", "deploy:make_simlinks" + #after "deploy:make_simlinks", "assets:precompile" + #after "assets:precompile", "deploy:restart" + #after "deploy:restart", "deploy:cleanup" - namespace :assets do - task :precompile, :roles => :web do - run "rm -rf #{release_path}/public/assets" - run "ln -s #{deploy_to}shared/assets #{release_path}/public/assets" + namespace :assets do + task :precompile, :roles => :web do + run "rm -rf #{release_path}/public/assets" + run "ln -s #{deploy_to}shared/assets #{release_path}/public/assets" - run "cd #{release_path} && bundle exec rake assets:precompile --trace" - end + run "cd #{release_path} && bundle exec rake assets:precompile --trace" + end - task :cleanup, :roles => :web do - run "cd #{current_path} && RAILS_ENV=production bundle exec rake assets:clean" - end - end + task :cleanup, :roles => :web do + run "cd #{current_path} && RAILS_ENV=production bundle exec rake assets:clean" + end + end - namespace :deploy do - task :bundle_gems do - run "cd #{release_path} && bundle install" - end + namespace :deploy do + task :bundle_gems do + run "cd #{release_path} && bundle install" + end - task :make_simlinks do - run "rm -rf #{release_path}/private_medias" - run "ln -s #{deploy_to}shared/storage/private #{release_path}/private_medias" - run "rm -rf #{release_path}/public/public_medias" - run "ln -s #{deploy_to}shared/storage/public #{release_path}/public/public_medias" - end + task :make_simlinks do + run "rm -rf #{release_path}/private_medias" + run "ln -s #{deploy_to}shared/storage/private #{release_path}/private_medias" + run "rm -rf #{release_path}/public/public_medias" + run "ln -s #{deploy_to}shared/storage/public #{release_path}/public/public_medias" + + run "rm -rf #{release_path}/db/production.sqlite3" + run "ln -s #{deploy_to}shared/production.sqlite3 #{release_path}/db/production.sqlite3" + end - task :start do - sudo "service #{application} start" - end - task :stop do - run "service #{application} stop" - end - task :restart, :roles => :app, :except => { :no_release => true } do - sudo "service #{application} restart" - end - task :migrate do - run "cd #{deploy_to}current && rake db:migrate RAILS_ENV=#{rails_env}" + task :start do + sudo "service #{application} start" + end + task :stop do + run "service #{application} stop" + end + task :restart, :roles => :app, :except => { :no_release => true } do + sudo "service #{application} restart" + end + + task :reload_nginx do + sudo "service nginx reload" + end + + task :migrate do + run "cd #{deploy_to}current && rake db:migrate RAILS_ENV=#{rails_env}" - end + end - task :seeds do - run "cd #{deploy_to}current && rake db:seeds RAILS_ENV=#{rails_env}" + task :seeds do + run "cd #{deploy_to}current && rake db:seeds RAILS_ENV=#{rails_env}" - end - end + end + end \ No newline at end of file diff --git a/config/nginx.conf b/config/nginx.conf index 0797963..86ca4d8 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,18 +1,18 @@ -upstream blog_perso_app_unicorn { +upstream ecole_eft_app_unicorn { server unix:/home/web/blog_perso_app/shared/tmp/unicorn.sock fail_timeout=0; } server { listen 80; - server_name blog.nicolasbally.com; - root /home/web/blog_perso_app/current/public; + server_name ecole-eft-france.fr; + root /home/web/ecole_eft_app/current/public; try_files $uri/index.html $uri @unicorn; location @unicorn { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; - proxy_pass http://blog_perso_app_unicorn; + proxy_pass http://ecole_eft_app_unicorn; } error_page 500 502 503 504 /500.html; @@ -22,6 +22,6 @@ server { server { listen 80; - server_name www.blog.nicolasbally.com; - rewrite ^(.*) http://blog.nicolasbally.com$1 permanent; + server_name www.ecole-eft-france.fr; + rewrite ^(.*) http://ecole-eft-france.fr$1 permanent; } diff --git a/config/unicorn.rb b/config/unicorn.rb index 0faa67c..b660cbf 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,4 +1,4 @@ -@rails_app = "blog_perso_app" +@rails_app = "ecole_eft_app" working_directory "/home/web/#{@rails_app}/current" pid "/home/web/#{@rails_app}/shared/unicorn.pid"