diff options
| -rw-r--r-- | Capfile | 1 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | config/deploy.rb | 7 | ||||
| -rw-r--r-- | config/deploy/production.rb | 2 | ||||
| -rw-r--r-- | config/sitemap.rb | 30 | ||||
| -rw-r--r-- | public/robots.txt | 1 |
7 files changed, 0 insertions, 47 deletions
@@ -1,6 +1,5 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator require 'bundler/capistrano' -require 'capistrano/sitemap_generator' # Uncomment if you are using Rails' asset pipeline load 'deploy/assets' @@ -35,9 +35,6 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] -# Sitemap -gem "sitemap_generator" - # API Rest gem 'sawyer', "~> 0.6.0" gem 'faraday_middleware', '~> 0.9.1' diff --git a/Gemfile.lock b/Gemfile.lock index 90390d341..6ae4b69c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,8 +389,6 @@ GEM simple_form (3.1.0) actionpack (~> 4.0) activemodel (~> 4.0) - sitemap_generator (5.0.5) - builder slop (3.6.0) spoon (0.0.4) ffi @@ -528,7 +526,6 @@ DEPENDENCIES sawyer (~> 0.6.0) sdoc (~> 0.4.0) simple_form (~> 3.1.0) - sitemap_generator spring sqlite3 squeel diff --git a/config/deploy.rb b/config/deploy.rb index a65db82df..285938700 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -24,8 +24,6 @@ after "deploy:update", "deploy:cleanup", "deploy:group_writable" after "deploy:update_code", "deploy:symlink_shared", "deploy:chouette_command", "deploy:gems" # ugly workaround for bug https://github.com/capistrano/capistrano/issues/81 before "deploy:assets:precompile", "deploy:symlink_shared" -after "deploy:restart", "delayed_job:restart" -after "deploy:migrate", "deploy:migrate_tenants" # If you want to use command line options, for example to start multiple workers, # define a Capistrano variable delayed_job_args: @@ -46,11 +44,6 @@ namespace :deploy do run "mkdir -p #{dirs.join(' ')} && (chmod g+w #{dirs.join(' ')} || true)" end - desc "Runs rake task which migrates database tables for all tenants" - task :migrate_tenants do - run "cd #{release_path} && RAILS_ENV=production bundle exec rake db:migrate" - end - desc "Install gems" task :gems, :roles => :app do run "cd #{release_path} && umask 02 && bundle install --path=#{shared_path}/bundle --without=development:test:cucumber" diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 8f300fdbf..c24f29894 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,5 +1,3 @@ server "chouette.marseille.cityway.fr", :app, :web, :db, :primary => true set :branch, "V2_5" set :gui_cmd, "2.5.1" - -after "deploy:update", "deploy:sitemap:refresh" diff --git a/config/sitemap.rb b/config/sitemap.rb deleted file mode 100644 index f76476c4e..000000000 --- a/config/sitemap.rb +++ /dev/null @@ -1,30 +0,0 @@ -# Set the host name for URL creation -SitemapGenerator::Sitemap.default_host = "http://appli.chouette.mobi/chouette2/" - -SitemapGenerator::Sitemap.create do - # Put links creation logic here. - # - # The root path '/' and sitemap index file are added automatically for you. - # Links are added to the Sitemap in the order they are specified. - # - # Usage: add(path, options={}) - # (default options are used if you don't specify) - # - # Defaults: :priority => 0.5, :changefreq => 'weekly', - # :lastmod => Time.now, :host => default_host - # - # Examples: - # - # Add '/articles' - # - # add articles_path, :priority => 0.7, :changefreq => 'daily' - # - # Add all articles: - # - # Article.find_each do |article| - # add article_path(article), :lastmod => article.updated_at - # end - - add '/help' - -end diff --git a/public/robots.txt b/public/robots.txt index 83584fb50..085187fa5 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -3,4 +3,3 @@ # To ban all spiders from the entire site uncomment the next two lines: # User-Agent: * # Disallow: / -Sitemap: http://appli.chouette.mobi/chouette2/sitemap.xml.gz |