From 9137744c6958a257252a46ef898570e72f60dcbb Mon Sep 17 00:00:00 2001 From: Wedge Date: Tue, 24 May 2016 18:17:08 +0300 Subject: [PATCH] Remove sitemap as it is not needed --- Gemfile | 1 - app/controllers/sitemap_controller.rb | 4 -- app/views/sitemap/robots.erb | 3 +- config/routes.rb | 2 - config/sitemap.rb | 58 --------------------------- 5 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 config/sitemap.rb diff --git a/Gemfile b/Gemfile index 9dcd146cd..7e019362c 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,6 @@ gem 'compass-rails' gem 'uglifier' gem 'therubyracer', platforms: [:mri, :rbx] gem 'therubyrhino', platforms: :jruby -gem 'sitemap_generator' source 'https://rails-assets.org' do gem 'rails-assets-notifyjs' diff --git a/app/controllers/sitemap_controller.rb b/app/controllers/sitemap_controller.rb index a5527a2db..f954853fa 100644 --- a/app/controllers/sitemap_controller.rb +++ b/app/controllers/sitemap_controller.rb @@ -1,10 +1,6 @@ class SitemapController < ApplicationController skip_after_action :verify_authorized - def show - redirect_to "/sitemaps/#{request.host_with_port.gsub(/www./, '')}/sitemap.xml.gz" - end - def robots render file: 'sitemap/robots', layout: false, content_type: Mime::TEXT end diff --git a/app/views/sitemap/robots.erb b/app/views/sitemap/robots.erb index 136243691..969d32cdd 100644 --- a/app/views/sitemap/robots.erb +++ b/app/views/sitemap/robots.erb @@ -2,5 +2,4 @@ User-agent: * Disallow: / -Host: <%= root_url.gsub(/\/$/, '') %> -Sitemap: <%= sitemap_url %> +Host: <%= root_url.gsub(/\/$/, '') %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 33bc7ecb7..9366fe9c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,8 +9,6 @@ Rails.application.routes.draw do end end - # Redirect sitemap1.xml.gz file on AWS S3 - match '/sitemap.xml.gz' => 'sitemap#show', via: [:get, :post, :head], as: :sitemap match '/robots.txt' => 'sitemap#robots', via: [:get, :post, :head], as: :robots resources :statistics, only: [:index] diff --git a/config/sitemap.rb b/config/sitemap.rb deleted file mode 100644 index 91299c7d3..000000000 --- a/config/sitemap.rb +++ /dev/null @@ -1,58 +0,0 @@ -%w(abf.openmandriva.org).each do |domain| - - SitemapGenerator::Sitemap.create( - default_host: "https://#{domain}", - sitemaps_path: "sitemaps/#{domain}" - ) do - - # root - add(root_path) - - # Projects - Project.opened.find_each do |project| - add(project_path(project), lastmod: project.updated_at) - end - - # BuildLists - BuildList.for_status(BuildList::BUILD_PUBLISHED). - where(platforms: { visibility: 'open' }, projects: { visibility: 'open' }). - joins(:save_to_platform, :project). - find_each do |bl| - add(build_list_path(bl), lastmod: bl.updated_at) - end - - # Platforms - Platform.opened.find_each do |platform| - add(platform_path(platform), lastmod: platform.updated_at) - - # Repositories - add(platform_repositories_path(platform), lastmod: platform.updated_at) - platform.repositories.find_each do |repository| - add(platform_repository_path(platform, repository), lastmod: repository.updated_at) - end - - - # Products - add(platform_products_path(platform), lastmod: platform.updated_at) - platform.products.find_each do |product| - add(platform_product_path(platform, product), lastmod: product.updated_at) - - # ProductBuildList (ISO) - product.product_build_lists.for_status(ProductBuildList::BUILD_COMPLETED).find_each do |pbl| - add(platform_product_product_build_list_path(platform, product, pbl), lastmod: pbl.updated_at) - end - end - end - - # Users - User.find_each do |user| - add(user_path(user), lastmod: user.updated_at) - end - - # Groups - Group.find_each do |group| - add(group_path(group), lastmod: group.updated_at) - end - - end -end \ No newline at end of file